|
 |
c2f1e0 |
From 5f8012de4cb73b90d69075e8118d904302d41c20 Mon Sep 17 00:00:00 2001
|
|
|
c2f1e0 |
From: Beniamino Galvani <bgalvani@redhat.com>
|
|
|
c2f1e0 |
Date: Mon, 9 Aug 2021 09:28:46 +0200
|
|
|
c2f1e0 |
Subject: [PATCH] fix(network-manager): check for nm-initrd-generator in both
|
|
|
c2f1e0 |
/usr/{libexec,lib}
|
|
|
c2f1e0 |
|
|
|
c2f1e0 |
Sice commit 22d6863ef1b2 ("fix(network-manager): cope with distributions not
|
|
|
c2f1e0 |
using `libexec`") nm-initrd-generator can be installed in either /usr/libexec
|
|
|
c2f1e0 |
or /usr/lib. Change other modules to check for the binary in both locations.
|
|
|
c2f1e0 |
|
|
|
c2f1e0 |
(cherry picked from commit 5ee7e249b8cc74461122ccd7efe954b3402c23da)
|
|
|
c2f1e0 |
|
|
|
c2f1e0 |
Resolves: #1975929
|
|
|
c2f1e0 |
---
|
|
|
c2f1e0 |
modules.d/40network/module-setup.sh | 2 +-
|
|
|
c2f1e0 |
modules.d/80cms/cmsifup.sh | 2 +-
|
|
|
c2f1e0 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
c2f1e0 |
|
|
|
c2f1e0 |
diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
|
|
|
c2f1e0 |
index 60824da6..9fd5d806 100755
|
|
|
c2f1e0 |
--- a/modules.d/40network/module-setup.sh
|
|
|
c2f1e0 |
+++ b/modules.d/40network/module-setup.sh
|
|
|
c2f1e0 |
@@ -19,7 +19,7 @@ depends() {
|
|
|
c2f1e0 |
if [ -z "$network_handler" ]; then
|
|
|
c2f1e0 |
if [[ -x $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
|
|
|
c2f1e0 |
network_handler="network-wicked"
|
|
|
c2f1e0 |
- elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]]; then
|
|
|
c2f1e0 |
+ elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then
|
|
|
c2f1e0 |
network_handler="network-manager"
|
|
|
c2f1e0 |
elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then
|
|
|
c2f1e0 |
network_handler="systemd-networkd"
|
|
|
c2f1e0 |
diff --git a/modules.d/80cms/cmsifup.sh b/modules.d/80cms/cmsifup.sh
|
|
|
c2f1e0 |
index a319227a..73d76fbf 100755
|
|
|
c2f1e0 |
--- a/modules.d/80cms/cmsifup.sh
|
|
|
c2f1e0 |
+++ b/modules.d/80cms/cmsifup.sh
|
|
|
c2f1e0 |
@@ -34,7 +34,7 @@ fi
|
|
|
c2f1e0 |
IFACES="$IFACES $DEVICE"
|
|
|
c2f1e0 |
echo "$IFACES" >> /tmp/net.ifaces
|
|
|
c2f1e0 |
|
|
|
c2f1e0 |
-if [ -x /usr/libexec/nm-initrd-generator ]; then
|
|
|
c2f1e0 |
+if [ -x /usr/libexec/nm-initrd-generator ] || [ -x /usr/lib/nm-initrd-generator ]; then
|
|
|
c2f1e0 |
type nm_generate_connections > /dev/null 2>&1 || . /lib/nm-lib.sh
|
|
|
c2f1e0 |
nm_generate_connections
|
|
|
c2f1e0 |
else
|
|
|
c2f1e0 |
|