From: Daniel Molkentin <dmolkentin@suse.com>
Date: Tue, 24 Nov 2020 18:52:23 +0000 (+0100)
Subject: 35network-wicked: Run wicked early enough to unlock block devices
X-Git-Tag: 051~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=983aee0ef17e6c6e144a47eb0d5d43f7623ed260;p=thirdparty%2Fdracut.git

35network-wicked: Run wicked early enough to unlock block devices
---

diff --git a/modules.d/35network-wicked/module-setup.sh b/modules.d/35network-wicked/module-setup.sh
index 83e5e6cf3..43af4c951 100755
--- a/modules.d/35network-wicked/module-setup.sh
+++ b/modules.d/35network-wicked/module-setup.sh
@@ -26,7 +26,7 @@ install() {
     inst_hook cmdline 99 "$moddir/wicked-config.sh"
 
     # Seems to not execute if in initqueue/settled
-    inst_hook pre-mount 99 "$moddir/wicked-run.sh"
+    inst_hook pre-udev 99 "$moddir/wicked-run.sh"
 
     inst_dir /etc/wicked/extensions
     inst_dir /usr/share/wicked/schema
@@ -51,6 +51,7 @@ install() {
 
     for unit in $wicked_units; do
         sed -i 's/^After=.*/After=dbus.service/g' $initdir/$unit
+        sed -i 's/^Before=\(.*\)/Before=\1 dracut-pre-udev.service/g' $initdir/$unit
         sed -i 's/^Wants=\(.*\)/Wants=\1 dbus.service/g' $initdir/$unit
         sed -i -e \
             '/^\[Unit\]/aDefaultDependencies=no\
diff --git a/modules.d/35network-wicked/wicked-run.sh b/modules.d/35network-wicked/wicked-run.sh
index 7481258bd..eaf427ac9 100755
--- a/modules.d/35network-wicked/wicked-run.sh
+++ b/modules.d/35network-wicked/wicked-run.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
+# ensure wickedd is running
 systemctl start wickedd
 # detection wrapper around ifup --ifconfig "final xml" all
 wicked bootstrap --ifconfig /tmp/dracut.xml all
-systemctl stop wickedd