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

This reverts commit 062a1e5ebbf6dab03524a125c1ce34d3cea43fcb.

1 files changed, 3 insertions, 7 deletions

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: