63ad96c6b1
- 0011-Revert-Manual-revert-Use-Network-Manager-and-Netplan.patch - 0012-Revert-Revert-Add-native-NetworkManager-support-1224.patch - 0013-net-sysconfig-do-not-use-the-highest-autoconnect-pri.patch - 0014-net-sysconfig-cosmetic-fix-tox-formatting.patch - 0015-nm-generate-ipv6-stateful-dhcp-config-at-par-with-sy.patch [bz#2207716] - 0016-network_manager-add-a-method-for-ipv6-static-IP-conf.patch [bz#2196284] - 0017-net-sysconfig-enable-sysconfig-renderer-if-network-m.patch [bz#2194050] - 0018-network-manager-Set-higher-autoconnect-priority-for-.patch [bz#2196231] - 0019-Set-default-renderer-as-sysconfig-for-c9s-RHEL-9.patch [bz#2209349] - Resolves: bz#2118235 bz#2194050 bz#2196231 bz#2196284 bz#2207716 bz#2209349
63 lines
2.0 KiB
Diff
63 lines
2.0 KiB
Diff
From 19adc5a0939fc1804b180333af5486e69d6af0ac Mon Sep 17 00:00:00 2001
|
|
From: Ani Sinha <anisinha@redhat.com>
|
|
Date: Mon, 22 May 2023 22:06:28 +0530
|
|
Subject: [PATCH] net/sysconfig: enable sysconfig renderer if network manager
|
|
has ifcfg-rh plugin (#4132)
|
|
|
|
Some distributions like RHEL does not have ifup and ifdown
|
|
scripts that traditionally handled ifcfg-eth* files. Instead RHEL
|
|
uses network manager with ifcfg-rh plugin to handle ifcfg
|
|
scripts. Therefore, the sysconfig should check for the
|
|
existence of ifcfg-rh plugin in addition to checking for the
|
|
existence of ifup and ifdown scripts in order to determine if it
|
|
can handle ifcfg files. If either the plugin or ifup/ifdown scripts
|
|
are present, sysconfig renderer can be enabled.
|
|
|
|
fixes: #4131
|
|
RHBZ: 2194050
|
|
|
|
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
|
(cherry picked from commit 009dbf85a72a9077b2267d377b2ff46639fb3def)
|
|
---
|
|
cloudinit/net/sysconfig.py | 19 +++++++++++++++++++
|
|
1 file changed, 19 insertions(+)
|
|
|
|
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
|
|
index fcce3e99..f2c7c92c 100644
|
|
--- a/cloudinit/net/sysconfig.py
|
|
+++ b/cloudinit/net/sysconfig.py
|
|
@@ -1,6 +1,7 @@
|
|
# This file is part of cloud-init. See LICENSE file for license information.
|
|
|
|
import copy
|
|
+import glob
|
|
import io
|
|
import os
|
|
import re
|
|
@@ -1059,7 +1060,25 @@ def _supported_vlan_names(rdev, vid):
|
|
def available(target=None):
|
|
if not util.system_info()["variant"] in KNOWN_DISTROS:
|
|
return False
|
|
+ if available_sysconfig(target):
|
|
+ return True
|
|
+ if available_nm_ifcfg_rh(target):
|
|
+ return True
|
|
+ return False
|
|
+
|
|
+
|
|
+def available_nm_ifcfg_rh(target=None):
|
|
+ # The ifcfg-rh plugin of NetworkManager is installed.
|
|
+ # NetworkManager can handle the ifcfg files.
|
|
+ return glob.glob(
|
|
+ subp.target_path(
|
|
+ target,
|
|
+ "usr/lib*/NetworkManager/*/libnm-settings-plugin-ifcfg-rh.so",
|
|
+ )
|
|
+ )
|
|
+
|
|
|
|
+def available_sysconfig(target=None):
|
|
expected = ["ifup", "ifdown"]
|
|
search = ["/sbin", "/usr/sbin"]
|
|
for p in expected:
|