Revert "Initial support for network --bootproto=ask (#401531)."

This reverts commit 062a1e5ebbf6dab03524a125c1ce34d3cea43fcb.

5 files changed, 11 insertions, 22 deletions

diff --git a/iw/network_gui.py b/iw/network_gui.py
index 34f799cc4..2a4c89303 100644
--- a/iw/network_gui.py
+++ b/iw/network_gui.py
@@ -341,7 +341,7 @@ class NetworkWindow(InstallWindow):
 	for device in self.devices.keys():
 	    bootproto = self.devices[device].get("bootproto")
 
-	    if bootproto and bootproto.lower() in ['ask', 'dhcp']:
+	    if bootproto and bootproto.lower() == 'dhcp':
 		onboot = self.devices[device].get("ONBOOT")
 		if onboot != "no":
 		    return 1
@@ -383,7 +383,7 @@ class NetworkWindow(InstallWindow):
 		active = False
 
 	    bootproto = self.devices[device].get("bootproto")
-	    if not bootproto or bootproto == "ask":
+	    if not bootproto:
 		bootproto = 'dhcp'
 		self.devices[device].set(("bootproto", bootproto))
 		
diff --git a/kickstart.py b/kickstart.py
index f78a4c00c..6b5068355 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -334,9 +334,9 @@ class Monitor(commands.monitor.FC6_Monitor):
         self.handler.id.instClass.setMonitor(self.handler.id, self.hsync,
                                              self.vsync, self.monitor)
 
-class Network(commands.network.F9_Network):
+class Network(commands.network.F8_Network):
     def parse(self, args):
-        commands.network.F9_Network.parse(self, args)
+        commands.network.F8_Network.parse(self, args)
 
         nd = self.network[-1]
 
@@ -1063,11 +1063,7 @@ def setSteps(anaconda):
     dispatch.skipStep("regkey")
     dispatch.skipStep("installtype")
     dispatch.skipStep("tasksel")
-
-    # Only skip the network screen if there are no devices that used
-    # network --bootproto=ask.
-    if len(filter(lambda nd: nd.bootProto == BOOTPROTO_ASK, ksdata.network.network)) == 0:
-        dispatch.skipStep("network")
+    dispatch.skipStep("network")
 
     # Don't show confirmation screens on non-interactive installs.
     if not interactive:
diff --git a/loader2/net.c b/loader2/net.c
index 674e36a2e..0be97f6ac 100644
--- a/loader2/net.c
+++ b/loader2/net.c
@@ -1655,10 +1655,7 @@ void setKickstartNetwork(struct loaderData_s * loaderData, int argc,
 
     /* if they've specified dhcp/bootp or haven't specified anything, 
      * use dhcp for the interface */
-    if (bootProto && !strncmp(bootProto, "ask", 3)) {
-        loaderData->ipv4 = strdup("ask");
-        loaderData->ipinfo_set = 0;
-    } else if ((bootProto && (!strncmp(bootProto, "dhcp", 4) || 
+    if ((bootProto && (!strncmp(bootProto, "dhcp", 4) || 
                        !strncmp(bootProto, "bootp", 4))) ||
         (!bootProto && !loaderData->ipv4)) {
         loaderData->ipv4 = strdup("dhcp");
@@ -1670,8 +1667,7 @@ void setKickstartNetwork(struct loaderData_s * loaderData, int argc,
 
     /* now make sure the specified bootproto is valid */
     if (bootProto && strcmp(bootProto, "dhcp") && strcmp(bootProto, "bootp") &&
-        strcmp(bootProto, "static") && strcmp(bootProto, "query") &&
-        strcmp(bootProto, "ask")) {
+        strcmp(bootProto, "static") && strcmp(bootProto, "query")) {
         newtWinMessage(_("Kickstart Error"), _("OK"),
                        _("Bad bootproto %s specified in network command"),
                        bootProto);
@@ -1928,10 +1924,7 @@ int kickstartNetworkUp(struct loaderData_s * loaderData,
         if (!loaderData->ipv4) {
             loaderData->ipv4 = strdup("dhcp");
         } 
-
-        if (strncmp(loaderData->ipv4, "ask", 3)) {
-            loaderData->ipinfo_set = 1;
-        }
+        loaderData->ipinfo_set = 1;
 
         setupNetworkDeviceConfig(netCfgPtr, loaderData);
 
diff --git a/network.py b/network.py
index 565d23846..8ae68d006 100644
--- a/network.py
+++ b/network.py
@@ -83,7 +83,7 @@ def isPtpDev(devname):
 def anyUsingDHCP(devices):
     for dev in devices.keys():
         bootproto = devices[dev].get("bootproto")
-        if bootproto and bootproto.lower() in ["ask", "dhcp"]:
+        if bootproto and bootproto.lower() == "dhcp":
             onboot = devices[dev].get("onboot")
             if onboot and onboot != "no":
                 return 1
diff --git a/textw/network_text.py b/textw/network_text.py
index 797d71cf2..a1660aa75 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 in ["ask", "dhcp"]))
+                           "dhcp", (bootproto == "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() in ['ask', 'dhcp']:
+            if dev.get('bootproto').lower() == 'dhcp':
                 ipv4 = _("DHCP")
             else:
                 ipv4 = dev.get('ipaddr')