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 7de89e98c8c06a98ae866ffaa519440709df0545..ae449fe7b8ceb4579e532437912ffca8e8349d72 100755 (executable)
--- 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 fe69b3e1a9710a19a47ac82397739a33a112d43a..82adfe09fc4311b182a57b5e568d30286d8ce4f5 100755 (executable)
--- 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