test for empty udev queue with timeout=1 instead of 0

older udev versions do not support timeout=0

diff --git a/modules.d/90dmraid/dmraid.sh b/modules.d/90dmraid/dmraid.sh
index 433e5d3d3d89659bad2e09d9ec5341c2b9f8ca54..66fe498399c4212f6c90ebe7af831eb49a5678a5 100755 (executable)
--- a/modules.d/90dmraid/dmraid.sh
+++ b/modules.d/90dmraid/dmraid.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if udevadm settle --timeout=0 >/dev/null 2>&1; then
+if udevadm settle --timeout=1 >/dev/null 2>&1; then
     # run dmraid if udev has settled
     dmraid -ay -Z
     [ -e "$job" ] && rm -f "$job"

diff --git a/modules.d/99base/init b/modules.d/99base/init
index 5d591da35cfe9d5737158b07b60f62d66fb29cff..fe062ebfcfb2647d236a0c52a9256b2ac2d792bb 100755 (executable)
--- a/modules.d/99base/init
+++ b/modules.d/99base/init
@@ -121,7 +121,7 @@ while :; do
 
     [ -n "$queuetriggered" ] && continue
 
-    if udevadm settle --timeout=0 >/dev/null 2>&1; then
+    if udevadm settle --timeout=1 >/dev/null 2>&1; then
         # no more udev jobs
         sleep 0.5
         i=$(($i+1))