Adjust the test in poll_device to look for either an unset OR an empty
2nd parameter.
Signed-off-by: Dave Reisner
---
init | 6 +-----
init_functions | 2 +-
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/init b/init
index 3351cfc..b375e72 100644
--- a/init
+++ b/init
@@ -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
--
1.8.0