f3523f3923
This is the first step for rebasing cloud-init to 21.3. All patches are rebased, old patches that are already on the release were deleted. Signed-off-by: Eduardo Otubo <otubo@redhat.com>
37 lines
1.6 KiB
Diff
37 lines
1.6 KiB
Diff
From 1a2b2cf55115a15244b9a7786959415f9fe421f9 Mon Sep 17 00:00:00 2001
|
|
From: Eduardo Otubo <otubo@redhat.com>
|
|
Date: Thu, 2 Sep 2021 10:36:28 +0200
|
|
Subject: [PATCH] Don't override default network configuration
|
|
|
|
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
|
---
|
|
cloudinit/net/sysconfig.py | 12 +++++++++++-
|
|
1 file changed, 11 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
|
|
index 06f7255e..bbe22d3d 100644
|
|
--- a/cloudinit/net/sysconfig.py
|
|
+++ b/cloudinit/net/sysconfig.py
|
|
@@ -940,7 +940,17 @@ class Renderer(renderer.Renderer):
|
|
# Distros configuring /etc/sysconfig/network as a file e.g. Centos
|
|
if sysconfig_path.endswith('network'):
|
|
util.ensure_dir(os.path.dirname(sysconfig_path))
|
|
- netcfg = [_make_header(), 'NETWORKING=yes']
|
|
+ # Make sure that existing lines, other than overriding ones, remain
|
|
+ netcfg = []
|
|
+ for line in util.load_file(sysconfig_path, quiet=True).split('\n'):
|
|
+ if 'cloud-init' in line:
|
|
+ break
|
|
+ if not line.startswith(('NETWORKING=',
|
|
+ 'IPV6_AUTOCONF=',
|
|
+ 'NETWORKING_IPV6=')):
|
|
+ netcfg.append(line)
|
|
+ # Now generate the cloud-init portion of sysconfig/network
|
|
+ netcfg.extend([_make_header(), 'NETWORKING=yes'])
|
|
if network_state.use_ipv6:
|
|
netcfg.append('NETWORKING_IPV6=yes')
|
|
netcfg.append('IPV6_AUTOCONF=no')
|
|
--
|
|
2.27.0
|
|
|