Merge pull request #3643 from stefansaraev/rpibootfuckery

[rfc] init: warn on obvious KERNEL/SYSTEM mismatch
This commit is contained in:
Stephan Raue 2014-12-11 23:52:42 +01:00
commit 8edcc98ea8
2 changed files with 14 additions and 2 deletions

View File

@ -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

View File

@ -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."
}