diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2006-05-19 18:05:06 +0200 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2006-05-19 18:05:06 +0200 |
| commit | 8aec5ee27513dc680d9920e4ea47581b8b9d8553 (patch) | |
| tree | 5cf79e865f5596e034afd3b55111c0da97e9931d | |
| parent | 1fb742a7d786c7806ed49c1e61447342096d9232 (diff) | |
| download | mkinitcpio-8aec5ee27513dc680d9920e4ea47581b8b9d8553.tar.gz mkinitcpio-8aec5ee27513dc680d9920e4ea47581b8b9d8553.tar.xz | |
rootfstype and rootdelay param handling changes
git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@111 880c04e9-e011-0410-abf7-b926e227c9cd
| -rw-r--r-- | hooks/filesystems | 2 | ||||
| -rw-r--r-- | 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 } @@ -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 |