Blame 0042-dracut-systemd-dracut-initqueue-only-start-service-i.patch

Harald Hoyer 368a0c
From e47907cc6b6eead2ab5ef4d5015445668822612a Mon Sep 17 00:00:00 2001
Harald Hoyer 368a0c
From: Harald Hoyer <harald@redhat.com>
Harald Hoyer 368a0c
Date: Mon, 13 Jul 2015 10:51:47 +0200
Harald Hoyer 368a0c
Subject: [PATCH] dracut-systemd/dracut-initqueue: only start service if really
Harald Hoyer 368a0c
 needed
Harald Hoyer 368a0c
Harald Hoyer 368a0c
Only start the dracut-initqueue.service, if the dracut_need_initqueue
Harald Hoyer 368a0c
command was issued on creation or later on set.
Harald Hoyer 368a0c
---
Harald Hoyer 368a0c
 modules.d/90lvm/module-setup.sh                     | 2 ++
Harald Hoyer 368a0c
 modules.d/90mdraid/module-setup.sh                  | 1 +
Harald Hoyer 368a0c
 modules.d/98dracut-systemd/dracut-initqueue.service | 5 -----
Harald Hoyer 368a0c
 3 files changed, 3 insertions(+), 5 deletions(-)
Harald Hoyer 368a0c
Harald Hoyer 368a0c
diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
Harald Hoyer 368a0c
index 8269078..42dda57 100755
Harald Hoyer 368a0c
--- a/modules.d/90lvm/module-setup.sh
Harald Hoyer 368a0c
+++ b/modules.d/90lvm/module-setup.sh
Harald Hoyer 368a0c
@@ -140,4 +140,6 @@ install() {
Harald Hoyer 368a0c
                       cache_dump cache_restore cache_check cache_repair \
Harald Hoyer 368a0c
                       era_check era_dump era_invalidate era_restore
Harald Hoyer 368a0c
     fi
Harald Hoyer 368a0c
+
Harald Hoyer 368a0c
+    dracut_need_initqueue
Harald Hoyer 368a0c
 }
Harald Hoyer 368a0c
diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh
Harald Hoyer 368a0c
index 621d0fb..cecf3bf 100755
Harald Hoyer 368a0c
--- a/modules.d/90mdraid/module-setup.sh
Harald Hoyer 368a0c
+++ b/modules.d/90mdraid/module-setup.sh
Harald Hoyer 368a0c
@@ -132,4 +132,5 @@ install() {
Harald Hoyer 368a0c
         fi
Harald Hoyer 368a0c
     fi
Harald Hoyer 368a0c
     inst_hook pre-shutdown 30 "$moddir/mdmon-pre-shutdown.sh"
Harald Hoyer 368a0c
+    dracut_need_initqueue
Harald Hoyer 368a0c
 }
Harald Hoyer 368a0c
diff --git a/modules.d/98dracut-systemd/dracut-initqueue.service b/modules.d/98dracut-systemd/dracut-initqueue.service
Harald Hoyer 368a0c
index 5d772f7..fa5ca56 100644
Harald Hoyer 368a0c
--- a/modules.d/98dracut-systemd/dracut-initqueue.service
Harald Hoyer 368a0c
+++ b/modules.d/98dracut-systemd/dracut-initqueue.service
Harald Hoyer 368a0c
@@ -17,11 +17,6 @@ After=systemd-udev-trigger.service
Harald Hoyer 368a0c
 Wants=systemd-udev-trigger.service
Harald Hoyer 368a0c
 ConditionPathExists=/usr/lib/initrd-release
Harald Hoyer 368a0c
 ConditionPathExists=|/lib/dracut/need-initqueue
Harald Hoyer 368a0c
-ConditionPathExistsGlob=|/lib/dracut/hooks/initqueue/*.sh
Harald Hoyer 368a0c
-ConditionPathExistsGlob=|/lib/dracut/hooks/initqueue/settled/*.sh
Harald Hoyer 368a0c
-ConditionPathExistsGlob=|/lib/dracut/hooks/initqueue/finished/*.sh
Harald Hoyer 368a0c
-ConditionPathExistsGlob=|/lib/dracut/hooks/initqueue/online/*.sh
Harald Hoyer 368a0c
-ConditionPathExistsGlob=|/lib/dracut/hooks/initqueue/timeout/*.sh
Harald Hoyer 368a0c
 ConditionKernelCommandLine=|rd.break=initqueue
Harald Hoyer 368a0c
 
Harald Hoyer 368a0c
 [Service]