diff options
| author | David Cantrell <dcantrell@redhat.com> | 2008-09-15 15:03:56 -1000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2008-09-15 15:03:56 -1000 |
| commit | 369ede365f9c4275746cada13bb71ce62ae0f47e (patch) | |
| tree | a90c8bb358e31ed6a8b5c4c8b3d724d299db45a9 /network.py | |
| parent | 838a9442a75d5b6c7e6cb8813b4999780925ad0c (diff) | |
| download | anaconda-369ede365f9c4275746cada13bb71ce62ae0f47e.tar.gz anaconda-369ede365f9c4275746cada13bb71ce62ae0f47e.tar.xz anaconda-369ede365f9c4275746cada13bb71ce62ae0f47e.zip | |
Avoid writing out NM_CONTROLLED more than once.
We always want to write:
NM_CONTROLLED=
to the ifcfg-DEVICE files regardless of the setting it has
during installation.
Diffstat (limited to 'network.py')
| -rw-r--r-- | network.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/network.py b/network.py index 77e0c9936..181a4b50e 100644 --- a/network.py +++ b/network.py @@ -169,7 +169,7 @@ class NetworkDevice(SimpleConfigFile): onBootWritten = 0 for key in keys: - if key in ("USEIPV4", "USEIPV6"): # XXX: these are per-device, but not written out + if key in ("USEIPV4", "USEIPV6", "NM_CONTROLLED"): continue if key == 'ONBOOT' and forceOffOnBoot: s = s + key + "=" + 'no' + "\n" @@ -533,7 +533,7 @@ class Network: if (bootproto == 'dhcp' and self.hostname and self.overrideDHCPhostname): f.write("DHCP_HOSTNAME=%s\n" %(self.hostname,)) - if dev.get('dhcpclass'): + if dev.get('DHCPCLASS'): f.write("DHCP_CLASSID=%s\n" % dev.get('dhcpclass')) if dev.get('MTU') and dev.get('MTU') != 0: @@ -553,7 +553,7 @@ class Network: f.write("NM_CONTROLLED=\n") f.close() - if dev.get("key"): + if dev.get("KEY"): fn = "%s/etc/sysconfig/network-scripts/keys-%s" % (instPath, device) f = open(fn, "w") |