diff options
| author | David Cantrell <dcantrell@redhat.com> | 2006-12-12 17:41:04 +0000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2006-12-12 17:41:04 +0000 |
| commit | 02260f4e3c56557cafe9db562325f3647dc60140 (patch) | |
| tree | a59daaa704925cc24c15a8f4c21830826504b22d /network.py | |
| parent | f47fc2ae5bf8da905df09a93020aa6da0d96b75e (diff) | |
| download | anaconda-02260f4e3c56557cafe9db562325f3647dc60140.tar.gz anaconda-02260f4e3c56557cafe9db562325f3647dc60140.tar.xz anaconda-02260f4e3c56557cafe9db562325f3647dc60140.zip | |
This new UI change is meant to match (as much as possible) what users see
in stage 1 and what users can see in the text mode version of stage 2.
These changes are meant for RHEL-5 as well.
* ui/netpostconfig.glade: Defines the Edit Network Device window used
in the stage 2 part of anaconda.
* loader2/net.c (writeNetInfo): Write out IPv6 settings.
* network.py (Network): Move the useIPv4 and useIPv6 flags to be per
device rather than per system.
* iw/network_gui.py: Removed old code in editDevice(), replaced with
NetworkDeviceEditWindow class. Removed the awful mess of input
validation code I had since the new dialog box handles all of that.
Support independent IPv4 and IPv6 stack configuration per device and
offer IPv6 automatic neighbor discovery in addition to DHCPv6 and
static configuration (#213110, #213112).
Diffstat (limited to 'network.py')
| -rw-r--r-- | network.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/network.py b/network.py index 576823f9c..a589404b3 100644 --- a/network.py +++ b/network.py @@ -172,8 +172,6 @@ class Network: self.domains = [] self.isConfigured = 0 self.hostname = "localhost.localdomain" - self.useIPv4 = flags.useIPv4 - self.useIPv6 = flags.useIPv6 # if we specify a hostname and are using dhcp, do an override # originally used by the gui but overloaded now @@ -204,6 +202,10 @@ class Network: "PEERID", "ESSID", "KEY", "IPV6ADDR", "IPV6_AUTOCONF"): if info.has_key(key): self.netdevices [info["DEVICE"]].set((key, info[key])) + + self.netdevices [info["DEVICE"]].set(('useIPv4', flags.useIPv4)) + self.netdevices [info["DEVICE"]].set(('useIPv6', flags.useIPv6)) + if info.has_key("GATEWAY"): self.gateway = info["GATEWAY"] if info.has_key("DOMAIN"): @@ -212,9 +214,9 @@ class Network: self.hostname = info["HOSTNAME"] if not info.has_key("BOOTPROTO"): if not info.has_key("IPADDR"): - self.useIPv4 = False - if not info.has_key("IPV6ADDR"): - self.useIPv6 = False + self.netdevices [info["DEVICE"]].set(('useIPv4', False)) + if not (info.has_key("IPV6ADDR") and info.has_key("IPV6_AUTOCONF")): + self.netdevices [info["DEVICE"]].set(('useIPv6', False)) try: f = open("/etc/resolv.conf", "r") |