summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaximilian attems <maks@debian.org>2008-04-29 20:29:36 +0200
committermaximilian attems <maks@debian.org>2008-04-29 20:29:36 +0200
commitda6b1999565d8d7d6504b21cb26f786166509f7a (patch)
tree14cf8ffc8466b4ba8d518e2c6373ceabfffd10a4
parent74be87d35841eae3c3febf00b568df5232c85f06 (diff)
downloadinitramfs-tools-da6b1999565d8d7d6504b21cb26f786166509f7a.tar.gz
initramfs-tools-da6b1999565d8d7d6504b21cb26f786166509f7a.zip
init: Fix hardcoded ROOT bootcase.
grave bug as makes a Debian slug unbootable. Thanks Kevin Price <kp@kevin-price.de> for report and Martin Michlmayr <tbm@cyrius.com> for debugging. The cause was the reordering of the ROOT export *after* it had been sourced in init. Fix it by allowing all exported variables to be ovverriden aka hardcoded.
-rwxr-xr-xinit14
1 files changed, 7 insertions, 7 deletions
diff --git a/init b/init
index 7f1d348..3fe1fab 100755
--- a/init
+++ b/init
@@ -27,13 +27,6 @@ mkdir /dev/.initramfs
export DPKG_ARCH=
. /conf/arch.conf
-# Bring in the main config
-. /conf/initramfs.conf
-for conf in conf/conf.d/*; do
- [ -f ${conf} ] && . ${conf}
-done
-. /scripts/functions
-
# Set modprobe env
export MODPROBE_OPTIONS="-qb"
@@ -52,6 +45,13 @@ export panic=
export blacklist=
export resume_offset=
+# Bring in the main config
+. /conf/initramfs.conf
+for conf in conf/conf.d/*; do
+ [ -f ${conf} ] && . ${conf}
+done
+. /scripts/functions
+
# Parse command line options
for x in $(cat /proc/cmdline); do
case $x in