From: Harald Hoyer <harald@redhat.com>
Date: Sat, 2 Mar 2013 12:15:21 +0000 (+0100)
Subject: reset initqueue loop counter only if new uevents exist
X-Git-Tag: 026~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f62f3a219112b6deb042b160b9009ab4dde79259;p=thirdparty%2Fdracut.git

reset initqueue loop counter only if new uevents exist
---

diff --git a/modules.d/98systemd/dracut-initqueue.sh b/modules.d/98systemd/dracut-initqueue.sh
index 7de89e98c..ae449fe7b 100755
--- a/modules.d/98systemd/dracut-initqueue.sh
+++ b/modules.d/98systemd/dracut-initqueue.sh
@@ -56,7 +56,7 @@ while :; do
         for job in $hookdir/initqueue/timeout/*.sh; do
             [ -e "$job" ] || break
             job=$job . $job
-            main_loop=0
+            udevadm settle --timeout=0 >/dev/null 2>&1 || main_loop=0
         done
     fi
 
diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
index fe69b3e1a..82adfe09f 100755
--- a/modules.d/99base/init.sh
+++ b/modules.d/99base/init.sh
@@ -188,7 +188,7 @@ while :; do
         for job in $hookdir/initqueue/timeout/*.sh; do
             [ -e "$job" ] || break
             job=$job . $job
-            main_loop=0
+            udevadm settle --timeout=0 >/dev/null 2>&1 || main_loop=0
         done
     fi