summaryrefslogtreecommitdiff
path: root/wla-redhat-Use-NetworkManager-to-set-DHCP-hostnames-on-r.patch
diff options
context:
space:
mode:
authorCoprDistGit <infra@openeuler.org>2024-08-05 01:31:14 +0000
committerCoprDistGit <infra@openeuler.org>2024-08-05 01:31:14 +0000
commit92fee7a73787ff2af3159dc0e7c18e5b15968e9f (patch)
tree374e1c8387153e4bd29e8bc53481f6284e562880 /wla-redhat-Use-NetworkManager-to-set-DHCP-hostnames-on-r.patch
parentd8a5aa1e74f0cf82eac0335d7272d41cf18eb23a (diff)
automatic import of WALinuxAgentopeneuler24.03_LTS
Diffstat (limited to 'wla-redhat-Use-NetworkManager-to-set-DHCP-hostnames-on-r.patch')
-rw-r--r--wla-redhat-Use-NetworkManager-to-set-DHCP-hostnames-on-r.patch49
1 files changed, 49 insertions, 0 deletions
diff --git a/wla-redhat-Use-NetworkManager-to-set-DHCP-hostnames-on-r.patch b/wla-redhat-Use-NetworkManager-to-set-DHCP-hostnames-on-r.patch
new file mode 100644
index 0000000..51f6e9c
--- /dev/null
+++ b/wla-redhat-Use-NetworkManager-to-set-DHCP-hostnames-on-r.patch
@@ -0,0 +1,49 @@
+From b85814d5683c7f8a1e1b5f3570bcce0a8f76137b Mon Sep 17 00:00:00 2001
+From: Mohammed Gamal <mgamal@redhat.com>
+Date: Fri, 29 Jul 2022 13:07:13 +0200
+Subject: [PATCH 1/2] redhat: Use NetworkManager to set DHCP hostnames on
+ recent RHEL distros
+
+RH-Author: Mohamed Gamal Morsy <mmorsy@redhat.com>
+RH-MergeRequest: 3: redhat: Use NetworkManager to set DHCP hostnames on recent RHEL distros
+RH-Commit: [1/1] 2bf51293796ba0e8567e436836adc0547f062b04
+RH-Bugzilla: 2114830
+RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2114830
+
+Recent versions of RHEL 8 and RHEL 9 started using NetworkManager to configure
+network intefaces instead of sysconfig files. Configurations are no longer
+stored in /etc/sysconfig/ifcfg-{interface}.
+
+Fix this for setting DHCP hostnames in those RHEL versions.
+
+Signed-off-by: Mohammed Gamal <mgamal@redhat.com>
+---
+ azurelinuxagent/common/osutil/redhat.py | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/azurelinuxagent/common/osutil/redhat.py b/azurelinuxagent/common/osutil/redhat.py
+index 5c397ae8..7dd36add 100644
+--- a/azurelinuxagent/common/osutil/redhat.py
++++ b/azurelinuxagent/common/osutil/redhat.py
+@@ -158,3 +158,15 @@ class RedhatOSUtil(Redhat6xOSUtil):
+ time.sleep(wait)
+ else:
+ logger.warn("exceeded restart retries")
++
++ def set_dhcp_hostname(self, hostname):
++ """
++ Recent RHEL distributions use network manager instead of sysconfig files
++ to configure network interfaces
++ """
++ ifname = self.get_if_name()
++
++ return_code = shellutil.run("nmcli device modify {0} ipv4.dhcp-hostname {1} ipv6.dhcp-hostname {1}".format(ifname, hostname))
++
++ if return_code != 0:
++ logger.error("failed to set DHCP hostname for interface {0}: return code {1}".format(ifname, return_code))
+--
+2.31.1
+