summaryrefslogtreecommitdiffstats
path: root/installclass.py
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2003-08-27 20:39:34 +0000
committerJeremy Katz <katzj@redhat.com>2003-08-27 20:39:34 +0000
commit3c90f8c3ae20fd2a69973bfc47ff6b208eb7ec59 (patch)
tree29b9eaa4777971a17e1f7668b276a9f24ffb11e2 /installclass.py
parent7b7b11935b430f32be38061b2c3506b4499895ff (diff)
downloadanaconda-3c90f8c3ae20fd2a69973bfc47ff6b208eb7ec59.tar.gz
anaconda-3c90f8c3ae20fd2a69973bfc47ff6b208eb7ec59.tar.xz
anaconda-3c90f8c3ae20fd2a69973bfc47ff6b208eb7ec59.zip
clean up bootdisk step skipping to be the same for install and upgrade, put
the common code in floppy.py
Diffstat (limited to 'installclass.py')
-rw-r--r--installclass.py13
1 files changed, 2 insertions, 11 deletions
diff --git a/installclass.py b/installclass.py
index acb7868f3..cbc4864a1 100644
--- a/installclass.py
+++ b/installclass.py
@@ -168,17 +168,8 @@ class BaseInstallClass:
# see if we need to write out a rescue boot floppy
if iutil.getArch() == "i386":
- import kudzu
- try:
- floppyDevices = 0
- for dev in kudzu.probe(kudzu.CLASS_FLOPPY, kudzu.BUS_UNSPEC,
- kudzu.PROBE_ALL):
- if not dev.detached:
- floppyDevices = floppyDevices + 1
- except:
- floppyDevices = 0
-
- if not floppyDevices:
+ import floppy
+ if not floppy.hasFloppyDevice():
dispatch.skipStep("bootdisk")
if iutil.getArch() != "i386" and iutil.getArch() != "x86_64":