diff options
| author | David Cantrell <dcantrell@redhat.com> | 2007-10-23 20:54:16 +0000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2007-10-23 20:54:16 +0000 |
| commit | 1b7c7b543c54c2030497760ef8c002c12e7f9d09 (patch) | |
| tree | 28a1032b45a20bb8edfd032080cb5115021515e2 /network.py | |
| parent | ef7b8d3aefe1e5c9962fe4070d0b254f4a755487 (diff) | |
| download | anaconda-1b7c7b543c54c2030497760ef8c002c12e7f9d09.tar.gz anaconda-1b7c7b543c54c2030497760ef8c002c12e7f9d09.tar.xz anaconda-1b7c7b543c54c2030497760ef8c002c12e7f9d09.zip | |
* network.py (Network.write): Set IPV6INIT for all cases (#328931).f8-base
Diffstat (limited to 'network.py')
| -rw-r--r-- | network.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/network.py b/network.py index 78d190c50..f081c2411 100644 --- a/network.py +++ b/network.py @@ -456,8 +456,8 @@ class Network: f.write("# %s\n" % (dev.get("DESC"),)) # handle IPv6 settings correctly for the ifcfg file - ipv6addr = dev.get("IPV6ADDR").lower() - ipv6prefix = dev.get("IPV6PREFIX").lower() + ipv6addr = dev.get('IPV6ADDR').lower() + ipv6prefix = dev.get('IPV6PREFIX').lower() dev.unset('IPV6ADDR') dev.unset('IPV6PREFIX') @@ -465,11 +465,16 @@ class Network: if ipv6addr == 'dhcp': dev.set(('IPV6INIT', 'yes')) elif ipv6addr != '' and ipv6addr is not None: + dev.set(('IPV6INIT', 'yes')) + if ipv6prefix != '' and ipv6prefix is not None: dev.set(('IPV6ADDR', ipv6addr + '/' + ipv6prefix)) else: dev.set(('IPV6ADDR', ipv6addr)) + if dev.get('IPV6_AUTOCONF').lower() == 'yes': + dev.set(('IPV6INIT', 'yes')) + f.write(str(dev)) # write out the hostname as DHCP_HOSTNAME if given (#81613) |