diff options
| author | Chris Lumens <clumens@redhat.com> | 2008-01-29 13:34:05 -0500 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2008-01-30 11:37:47 -0500 |
| commit | b4ac8dda462c09e38799645e8eead41ce8c1b093 (patch) | |
| tree | 841c07881a4f932737e6b0f6bc0bd86ea9c4be42 /iw | |
| parent | 70a6f160ce65ea2af4c69215f83524071b27e42d (diff) | |
| download | anaconda-b4ac8dda462c09e38799645e8eead41ce8c1b093.tar.gz anaconda-b4ac8dda462c09e38799645e8eead41ce8c1b093.tar.xz anaconda-b4ac8dda462c09e38799645e8eead41ce8c1b093.zip | |
Initial support for network --bootproto=query (#401531).
This patch adds support for a new network bootproto. The point of this is
to work around our basic assumption that no network line in the kickstart
file means you get dhcp. Some environments may want the assumption that
no network line means you get prompted for network configuration. That's
what this patch adds.
Diffstat (limited to 'iw')
| -rw-r--r-- | iw/network_gui.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/iw/network_gui.py b/iw/network_gui.py index 7dc39207c..1aaeff372 100644 --- a/iw/network_gui.py +++ b/iw/network_gui.py @@ -293,7 +293,7 @@ class NetworkWindow(InstallWindow): if device.get('ipaddr').lower() == 'dhcp': ip = 'DHCP' - elif device.get('bootproto').lower() == 'dhcp': + elif device.get('bootproto').lower() in ['query', 'dhcp']: ip = 'DHCP' else: prefix = str(isys.netmask2prefix(device.get('netmask'))) @@ -309,7 +309,7 @@ class NetworkWindow(InstallWindow): addr = device.get('ipv6addr').lower() pfx = device.get('ipv6prefix').lower() - if auto == 'yes' or addr == '': + if auto == 'yes' or addr == '' or addr == 'query': ip = 'Auto' elif addr == 'dhcp': ip = 'DHCPv6' @@ -334,7 +334,7 @@ class NetworkWindow(InstallWindow): for device in self.devices.keys(): bootproto = self.devices[device].get("bootproto") - if bootproto and bootproto.lower() == 'dhcp': + if bootproto and bootproto.lower() in ['query', 'dhcp']: onboot = self.devices[device].get("ONBOOT") if onboot != "no": return 1 @@ -376,7 +376,7 @@ class NetworkWindow(InstallWindow): active = False bootproto = self.devices[device].get("bootproto") - if not bootproto: + if not bootproto or bootproto == 'query': bootproto = 'dhcp' self.devices[device].set(("bootproto", bootproto)) |