From: Harald Hoyer <harald@redhat.com>
Date: Mon, 13 Jul 2009 09:56:04 +0000 (+0200)
Subject: test for empty udev queue with timeout=1 instead of 0
X-Git-Tag: 0.5~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d72eec354ae34827d34a802283e006aafcce4d08;p=thirdparty%2Fdracut.git

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 433e5d3d3..66fe49839 100755
--- 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 5d591da35..fe062ebfc 100755
--- 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))