37 lines
1.6 KiB
Diff
37 lines
1.6 KiB
Diff
|
From 674873573abf2b6e10b09d533a58437c35d508f8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Eduardo Otubo <otubo@redhat.com>
|
||
|
|
Date: Fri, 21 Feb 2020 11:40:34 +0100
|
||
|
|
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 310cdf01..87b8f743 100644
|
||
|
|
--- a/cloudinit/net/sysconfig.py
|
||
|
|
+++ b/cloudinit/net/sysconfig.py
|
||
|
|
@@ -755,7 +755,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.17.2
|
||
|
|
|