From 8aec5ee27513dc680d9920e4ea47581b8b9d8553 Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaron@archlinux.org>
Date: Fri, 19 May 2006 16:05:06 +0000
Subject: rootfstype and rootdelay param handling changes

git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@111 880c04e9-e011-0410-abf7-b926e227c9cd
---
 hooks/filesystems | 2 ++
 init              | 3 +--
 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
-- 
cgit v1.2.3-24-g4f1b