|
 |
6edea0 |
From 0945c8070e436eef908a1f88c946df6c27d3bc41 Mon Sep 17 00:00:00 2001
|
|
|
6edea0 |
From: Peter Georg <peter.georg@physik.uni-regensburg.de>
|
|
|
6edea0 |
Date: Tue, 21 Apr 2020 21:34:38 +0200
|
|
|
6edea0 |
Subject: [PATCH] Always pull in machinery to read ifcfg files
|
|
|
6edea0 |
|
|
|
6edea0 |
So far machinery is only pulled in if the user has not yet included any
|
|
|
6edea0 |
ifcfg files.
|
|
|
6edea0 |
|
|
|
6edea0 |
(cherry picked from commit faea4e4ddb10f697590b80f8f17181341c537262)
|
|
|
6edea0 |
|
|
|
6edea0 |
Resolves: #1826061
|
|
|
6edea0 |
---
|
|
|
6edea0 |
modules.d/35network-manager/module-setup.sh | 6 ++----
|
|
|
6edea0 |
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
|
6edea0 |
|
|
|
6edea0 |
diff --git a/modules.d/35network-manager/module-setup.sh b/modules.d/35network-manager/module-setup.sh
|
|
|
6edea0 |
index 8fc3114d..ad2a1534 100755
|
|
|
6edea0 |
--- a/modules.d/35network-manager/module-setup.sh
|
|
|
6edea0 |
+++ b/modules.d/35network-manager/module-setup.sh
|
|
|
6edea0 |
@@ -47,10 +47,8 @@ install() {
|
|
|
6edea0 |
fi
|
|
|
6edea0 |
|
|
|
6edea0 |
# We don't install the ifcfg files from the host automatically.
|
|
|
6edea0 |
- # But if the user chooses to include them, we pull in the machinery to read them.
|
|
|
6edea0 |
- if ! [[ -d "$initdir/etc/sysconfig/network-scripts" ]]; then
|
|
|
6edea0 |
- inst_libdir_file "NetworkManager/$_nm_version/libnm-settings-plugin-ifcfg-rh.so"
|
|
|
6edea0 |
- fi
|
|
|
6edea0 |
+ # But the user might choose to include them, so we pull in the machinery to read them.
|
|
|
6edea0 |
+ inst_libdir_file "NetworkManager/$_nm_version/libnm-settings-plugin-ifcfg-rh.so"
|
|
|
6edea0 |
|
|
|
6edea0 |
_arch=${DRACUT_ARCH:-$(uname -m)}
|
|
|
6edea0 |
|
|
|
6edea0 |
|