From 912e3794dbbb0ac10331e31f8d8e1d9e616ebe7e Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 23 Nov 2014 19:06:08 +0200 Subject: [PATCH] init: warn on obvious KERNEL/SYSTEM mismatch ... because rpi / netboot users still cant get it --- packages/sysutils/busybox/config/busybox-init.conf | 4 ++-- packages/sysutils/busybox/scripts/init | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/busybox/config/busybox-init.conf b/packages/sysutils/busybox/config/busybox-init.conf index 6c6afc1f47..221b7875f6 100644 --- a/packages/sysutils/busybox/config/busybox-init.conf +++ b/packages/sysutils/busybox/config/busybox-init.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.22.1 -# Thu Apr 24 17:06:16 2014 +# Sun Nov 23 18:41:18 2014 # CONFIG_HAVE_DOT_CONFIG=y @@ -286,7 +286,7 @@ CONFIG_FEATURE_FANCY_TAIL=y # CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set # CONFIG_TRUE is not set # CONFIG_TTY is not set -# CONFIG_UNAME is not set +CONFIG_UNAME=y # CONFIG_UNEXPAND is not set # CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set # CONFIG_UNIQ is not set diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index 625f49480c..d197a2bc59 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -599,6 +599,18 @@ mount --move /storage /sysroot/storage fi + if [ ! -d "/sysroot/lib/modules/$(uname -r)/" -a -f "/sysroot/usr/lib/systemd/systemd" ]; then + echo "" + echo "NEVER TOUCH boot= in extlinux.conf / cmdline.txt" + echo "if you dont know what you are doing" + echo "" + echo "your installation is now broken" + echo "" + echo "normal boot in 60s..." + usleep 60000000 + fi + + [ -f "/sysroot/usr/lib/systemd/systemd" ] || error "final_check" "Could not find system." }