dracut-systemd/dracut-initqueue: only start service if really needed

Only start the dracut-initqueue.service, if the dracut_need_initqueue
command was issued on creation or later on set.

diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
index 82690781b994ca749f2ea5a8f5868e076e96c7c0..42dda5750020ef6aed43c7f78bdb89e71dcd9202 100755 (executable)
--- a/modules.d/90lvm/module-setup.sh
+++ b/modules.d/90lvm/module-setup.sh
@@ -140,4 +140,6 @@ install() {
                       cache_dump cache_restore cache_check cache_repair \
                       era_check era_dump era_invalidate era_restore
     fi
+
+    dracut_need_initqueue
 }

diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh
index 621d0fb96cb679a5c79d5622ca8f1b88a5fb3d0c..cecf3bf8e64b02e315131b21584c321891b3ffb8 100755 (executable)
--- a/modules.d/90mdraid/module-setup.sh
+++ b/modules.d/90mdraid/module-setup.sh
@@ -132,4 +132,5 @@ install() {
         fi
     fi
     inst_hook pre-shutdown 30 "$moddir/mdmon-pre-shutdown.sh"
+    dracut_need_initqueue
 }

diff --git a/modules.d/98dracut-systemd/dracut-initqueue.service b/modules.d/98dracut-systemd/dracut-initqueue.service
index 5d772f7080a0c8de8d30e7992bbd9a491c80c64f..fa5ca56153ec5c5c9debe336aa16611ffbdf3131 100644 (file)
--- a/modules.d/98dracut-systemd/dracut-initqueue.service
+++ b/modules.d/98dracut-systemd/dracut-initqueue.service
@@ -17,11 +17,6 @@ After=systemd-udev-trigger.service
 Wants=systemd-udev-trigger.service
 ConditionPathExists=/usr/lib/initrd-release
 ConditionPathExists=|/lib/dracut/need-initqueue
-ConditionPathExistsGlob=|/lib/dracut/hooks/initqueue/*.sh
-ConditionPathExistsGlob=|/lib/dracut/hooks/initqueue/settled/*.sh
-ConditionPathExistsGlob=|/lib/dracut/hooks/initqueue/finished/*.sh
-ConditionPathExistsGlob=|/lib/dracut/hooks/initqueue/online/*.sh
-ConditionPathExistsGlob=|/lib/dracut/hooks/initqueue/timeout/*.sh
 ConditionKernelCommandLine=|rd.break=initqueue
 
 [Service]