From: Daniel Molkentin <dmolkentin@suse.com>
Date: Fri, 21 Aug 2020 16:04:11 +0000 (+0200)
Subject: 40network: introduce wicked option
X-Git-Tag: 051~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fc7c05321e2833b60e37fa9b72715e73bbc6ff2;p=thirdparty%2Fdracut.git

40network: introduce wicked option
---

diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
index af1535280..eca635d5f 100755
--- a/modules.d/40network/module-setup.sh
+++ b/modules.d/40network/module-setup.sh
@@ -7,15 +7,25 @@ check() {
 
 # called by dracut
 depends() {
-    echo -n "kernel-network-modules "
-
     is_qemu_virtualized && echo -n "qemu-net "
 
-    if ! dracut_module_included "network-legacy" && [ -x "$dracutsysrootdir/usr/libexec/nm-initrd-generator" ] ; then
-        echo "network-manager"
-    else
-        echo "network-legacy"
-    fi
+    for module in network-wicked network-manager network-legacy ; do
+        if dracut_module_included "$module" ; then
+                network_handler="$module"
+                break
+            fi
+        done;
+
+        if [ -z "$network_handler" ]; then
+            if require_binaries wicked; then
+                network_handler="network-wicked"
+            elif [ -x "$dracutsysrootdir/usr/libexec/nm-initrd-generator" ]; then
+                network_handler="network-manager"
+            else
+                network_handler="network-legacy"
+            fi
+        fi
+    echo "kernel-network-modules $network_handler"
     return 0
 }