summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--hooks/filesystems2
-rw-r--r--init3
2 files changed, 3 insertions, 2 deletions
diff --git a/hooks/filesystems b/hooks/filesystems
index 416ad9f..77ebde3 100644
--- a/hooks/filesystems
+++ b/hooks/filesystems
@@ -13,6 +13,7 @@ run_hook ()
/bin/sleep "${rootdelay}"
msg "done."
export rootdelay=0
+ kinit_params="${kinit_params} rootdelay=0"
fi
eval $( /bin/parseblock "${root}")
@@ -36,6 +37,7 @@ run_hook ()
if [ "${FSTYPE}" = "unknown" ]; then
echo "ERROR: root fs cannot be detected. Try using the rootfstype= kernel parameter."
else
+ kinit_params="${kinit_params} rootfstype=${FSTYPE}"
/bin/modprobe -q "${FSTYPE}" >/dev/null 2>&1
fi
}
diff --git a/init b/init
index 7bdac5b..93fcc9a 100644
--- a/init
+++ b/init
@@ -13,7 +13,6 @@ export CMDLINE
# Used so hooks can override params to kinit
export root=""
-export rootdelay="0"
export kinit_params=""
echo "/bin/modprobe" > /proc/sys/kernel/modprobe
@@ -82,4 +81,4 @@ fi
msg ":: Initramfs Completed - control passing to kinit"
echo "/sbin/modprobe" > /proc/sys/kernel/modprobe
-exec /bin/kinit "root=${root}" "rootdelay=${rootdelay}" ${kinit_params} < /dev/console > /dev/null 2>&1
+exec /bin/kinit "root=${root}" ${kinit_params} < /dev/console > /dev/null 2>&1