diff options
| author | Chris Lumens <clumens@redhat.com> | 2008-01-16 14:12:43 -0500 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2008-01-16 14:29:40 -0500 |
| commit | 062a1e5ebbf6dab03524a125c1ce34d3cea43fcb (patch) | |
| tree | 8fda306aa721b5cde0f1c14fff5e1d60bce06c62 /textw/network_text.py | |
| parent | 2b73745c33d2ddd302bfd14152e97a05dab75d9b (diff) | |
| download | anaconda-062a1e5ebbf6dab03524a125c1ce34d3cea43fcb.tar.gz anaconda-062a1e5ebbf6dab03524a125c1ce34d3cea43fcb.tar.xz anaconda-062a1e5ebbf6dab03524a125c1ce34d3cea43fcb.zip | |
Initial support for network --bootproto=ask (#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 'textw/network_text.py')
| -rw-r--r-- | textw/network_text.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/textw/network_text.py b/textw/network_text.py index a1660aa75..797d71cf2 100644 --- a/textw/network_text.py +++ b/textw/network_text.py @@ -270,7 +270,7 @@ class NetworkDeviceWindow: maingrid = Grid(1, 3) dhcpCb = radio.add(_("Dynamic IP configuration (DHCP)"), - "dhcp", (bootproto == "dhcp")) + "dhcp", (bootproto in ["ask", "dhcp"])) maingrid.setField(dhcpCb, 0, 0, growx = 1, anchorLeft = 1) manualCb = radio.add(_("Manual address configuration"), "static", (bootproto == "static")) @@ -626,7 +626,7 @@ class NetworkDeviceWindow: else: onboot = _("Inactive on boot") - if dev.get('bootproto').lower() == 'dhcp': + if dev.get('bootproto').lower() in ['ask', 'dhcp']: ipv4 = _("DHCP") else: ipv4 = dev.get('ipaddr') |