diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2012-11-18 01:29:44 +0100 |
|---|---|---|
| committer | Dave Reisner <dreisner@archlinux.org> | 2012-11-24 00:01:34 +0100 |
| commit | 4976072037baede0faeaf94362e282f26f19d6af (patch) | |
| tree | 954f2446c0fde5f44db3bfe4fde01be76d601701 | |
| parent | 42c01012e85646706bf11042cc0952d47d9236d0 (diff) | |
| download | mkinitcpio-4976072037baede0faeaf94362e282f26f19d6af.tar.gz mkinitcpio-4976072037baede0faeaf94362e282f26f19d6af.tar.xz | |
init: remove needless workaround for empty rootdelay
Adjust the test in poll_device to look for either an unset OR an empty
2nd parameter.
Signed-off-by: Dave Reisner <dreisner@archlinux.org>
| -rw-r--r-- | init | 6 | ||||
| -rw-r--r-- | init_functions | 2 |
2 files changed, 2 insertions, 6 deletions
@@ -1,4 +1,5 @@ #!/usr/bin/ash + udevd_running=0 if [ -x /usr/bin/systemd-timestamp ]; then @@ -28,11 +29,6 @@ if [ -n "$earlymodules$MODULES" ]; then modprobe -qab ${earlymodules//,/ } $MODULES fi -# If rootdelay is empty or not a non-negative integer, set it to 10 -if [ -z "${rootdelay}" ] || ! [ "${rootdelay}" -ge 0 ]; then - rootdelay=10 -fi - run_hookfunctions 'run_hook' 'hook' $HOOKS # honor the old behavior of break=y as a synonym for break=premount diff --git a/init_functions b/init_functions index 2bd07bd..bdc6cc9 100644 --- a/init_functions +++ b/init_functions @@ -10,7 +10,7 @@ err () { poll_device() { local device=$1 seconds=${2//[!0-9]} - [ -z "$seconds" ] && seconds=10 + [ "${seconds:-x}" = x ] && seconds=10 deciseconds=$(( seconds * 10 )) # tenths of a second |