diff options
author | Thomas Bächler <thomas@archlinux.org> | 2009-06-07 14:47:52 +0200 |
---|---|---|
committer | Thomas Bächler <thomas@archlinux.org> | 2009-06-07 14:47:52 +0200 |
commit | ce6e83fe333622bc306cfb3c9b5822d8f6d9f213 (patch) | |
tree | 3fd70672e0ce2e9674e40d68c013d49ee26c96c6 /init | |
parent | 50db40944476af56188d3d9060d0c826e7a75af5 (diff) | |
download | mkinitcpio-ce6e83fe333622bc306cfb3c9b5822d8f6d9f213.tar.gz mkinitcpio-ce6e83fe333622bc306cfb3c9b5822d8f6d9f213.tar.xz |
Always use rootdelay when polling a device, set it earlier in the init file0.5.25
Diffstat (limited to 'init')
-rw-r--r-- | init | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -63,6 +63,13 @@ for m in ${MODULES}; do fi done +# If rootdelay is empty or not a non-negative integer, set it to 10 +if [ -z "${rootdelay}" -o ! "${rootdelay}" -ge 0 ]; then + export rootdelay=10 +fi +# We'll wait for the root device, so make sure klibc doesn't +export kinit_params="${kinit_params} rootdelay=0" + if [ -e "/hooks" ]; then for h in ${HOOKS}; do TST="" @@ -84,13 +91,6 @@ if [ "${break}" = "y" ]; then PS1="ramfs$ " /bin/sh -i fi -# If rootdelay is empty or not a non-negative integer, set it to 10 -if [ -z "${rootdelay}" -o ! "${rootdelay}" -ge 0 ]; then - export rootdelay=10 - # We'll wait for the root device, so make sure klibc doesn't - export kinit_params="$kinit_params rootdelay=0" -fi - # If we boot from NFS, don't check for a block device in /dev # Let kinit do it all if [ -z "${nfsroot}" -a "${root}" != "/dev/nfs" ]; then |