From: Jóhann B. Guðmundsson <johannbg@gmail.com>
Date: Tue, 27 Apr 2021 09:55:12 +0000 (+0000)
Subject: fix(network): use wicked unit instead of find_binary
X-Git-Tag: 054~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57eefcf70587f06b8874a3b3cf31e9ab70c03227;p=thirdparty%2Fdracut.git

fix(network): use wicked unit instead of find_binary

dracut-install triggers "ERROR: installing '/usr/lib/wicked/bin/*'"
when find_binary is being used to determine if wicked is installed
so let's just check for the wicked type service unit instead.
---

diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
index 4c63e8284..648d84d63 100755
--- a/modules.d/40network/module-setup.sh
+++ b/modules.d/40network/module-setup.sh
@@ -17,7 +17,7 @@ depends() {
     done
 
     if [ -z "$network_handler" ]; then
-        if find_binary wicked &> /dev/null; then
+        if [[ -x $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
             network_handler="network-wicked"
         elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]]; then
             network_handler="network-manager"