|
 |
d4a4eb |
From 7843bc52777683f6a4ef953d8dde7171ff3b911c Mon Sep 17 00:00:00 2001
|
|
|
d4a4eb |
From: Lubomir Rintel <lkundrak@v3.sk>
|
|
|
d4a4eb |
Date: Wed, 24 Jul 2019 16:45:19 +0200
|
|
|
d4a4eb |
Subject: [PATCH] [RHEL] network: default to network-legacy even in presence of
|
|
|
d4a4eb |
nm-initrd-generator
|
|
|
d4a4eb |
|
|
|
d4a4eb |
In RHEL 8.2, NetworkManager will ship with the nm-initrd-generator, but
|
|
|
d4a4eb |
before the install bits fall into place we want to default to network-legacy.
|
|
|
d4a4eb |
|
|
|
d4a4eb |
This unblocks the enablement of the NetworkManager bits and is intended
|
|
|
d4a4eb |
to be reverted later on.
|
|
|
d4a4eb |
---
|
|
|
d4a4eb |
modules.d/40network/module-setup.sh | 6 +++---
|
|
|
d4a4eb |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
d4a4eb |
|
|
|
d4a4eb |
diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
|
|
|
d4a4eb |
index 8e2a74a3..bf252eb7 100755
|
|
|
d4a4eb |
--- a/modules.d/40network/module-setup.sh
|
|
|
d4a4eb |
+++ b/modules.d/40network/module-setup.sh
|
|
|
d4a4eb |
@@ -8,9 +8,9 @@ check() {
|
|
|
d4a4eb |
# called by dracut
|
|
|
d4a4eb |
depends() {
|
|
|
d4a4eb |
echo -n "kernel-network-modules "
|
|
|
d4a4eb |
- if ! dracut_module_included "network-legacy" && [ -x "/usr/libexec/nm-initrd-generator" ] ; then
|
|
|
d4a4eb |
- echo "network-manager"
|
|
|
d4a4eb |
- else
|
|
|
d4a4eb |
+ # RHEL 8.1: Default to network-legacy unless the user chose
|
|
|
d4a4eb |
+ # network-manager manually
|
|
|
d4a4eb |
+ if ! dracut_module_included "network-manager" ; then
|
|
|
d4a4eb |
echo "network-legacy"
|
|
|
d4a4eb |
fi
|
|
|
d4a4eb |
return 0
|
|
|
d4a4eb |
|