summaryrefslogtreecommitdiffstats
path: root/kickstart.py
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2008-01-30 11:46:19 -0500
committerChris Lumens <clumens@redhat.com>2008-01-30 17:28:16 -0500
commit11377383a17904870d71a2c204937af7466e9a8a (patch)
treec0b4c92f1963ebd565f3c57cbc5689463e3d828a /kickstart.py
parent6b8ef69abd2f581f9f0a64af5998a6e2abe42b33 (diff)
downloadanaconda-11377383a17904870d71a2c204937af7466e9a8a.tar.gz
anaconda-11377383a17904870d71a2c204937af7466e9a8a.tar.xz
anaconda-11377383a17904870d71a2c204937af7466e9a8a.zip
Revert "Initial support for network --bootproto=ask (#401531)."
This reverts commit 062a1e5ebbf6dab03524a125c1ce34d3cea43fcb.
Diffstat (limited to 'kickstart.py')
-rw-r--r--kickstart.py10
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: