summaryrefslogtreecommitdiffstats
path: root/anaconda
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2007-10-26 19:46:56 +0000
committerChris Lumens <clumens@redhat.com>2007-10-26 19:46:56 +0000
commita7c2bb220e5053c78d1d44ccda3f32819a128c77 (patch)
tree2eeb982dd96287d4c73d413d49a425883454aef8 /anaconda
parentb7315b8d3cd006dea4b4f23a882840465502ca29 (diff)
downloadanaconda-a7c2bb220e5053c78d1d44ccda3f32819a128c77.tar.gz
anaconda-a7c2bb220e5053c78d1d44ccda3f32819a128c77.tar.xz
anaconda-a7c2bb220e5053c78d1d44ccda3f32819a128c77.zip
Since the exception dialog no longer probes for the floppy in advance,
there's no reason to keep floppy.py around anymore.
Diffstat (limited to 'anaconda')
-rwxr-xr-xanaconda7
1 files changed, 2 insertions, 5 deletions
diff --git a/anaconda b/anaconda
index a9f8b4ed6..50c0719f5 100755
--- a/anaconda
+++ b/anaconda
@@ -436,9 +436,6 @@ def probeHW(opts, x_already_set, xserver):
if opts.keymap:
xserver.keyboard.set(opts.keymap)
- # floppy
- return floppy.probeFloppyDevice()
-
def setupGraphicalLinks():
for i in ( "imrc", "im_palette.pal", "gtk-2.0", "pango", "fonts",
"fb.modes"):
@@ -776,7 +773,7 @@ if __name__ == "__main__":
else:
xserver = None
- floppyDevice = probeHW(opts, x_already_set, xserver)
+ probeHW(opts, x_already_set, xserver)
#
# delay to let use see status of attempt to probe hw
@@ -869,7 +866,7 @@ if __name__ == "__main__":
anaconda.setBackend(instClass)
- anaconda.id = instClass.installDataClass(anaconda, extraModules, floppyDevice, anaconda.methodstr, opts.display_mode, anaconda.backend)
+ anaconda.id = instClass.installDataClass(anaconda, extraModules, anaconda.methodstr, opts.display_mode, anaconda.backend)
anaconda.id.x_already_set = x_already_set