diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rwxr-xr-x | anaconda | 7 | ||||
| -rw-r--r-- | floppy.py | 56 | ||||
| -rw-r--r-- | instdata.py | 3 |
4 files changed, 14 insertions, 64 deletions
@@ -1,9 +1,19 @@ 2007-10-26 Chris Lumens <clumens@redhat.com> + * anaconda: Don't need to probe for floppy hardware anymore since the + exception dialog doesn't look for it in advance. + + * instdata.py (InstallData.__init__): Don't accept a floppyDevice + parameter anymore. + + * floppy.py: Removed unused code. + +2007-10-26 Chris Lumens <clumens@redhat.com> + * constants.py: Add constants for the actions that can take place on the exception handling UI. - * exception.py: + * exception.py: Rework functions to handle the new save dialog. * gui.py (ScpWindow): Remove this class in favor of a glade file. (SaveExceptionWindow): Create a new class to handle all the @@ -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 diff --git a/floppy.py b/floppy.py deleted file mode 100644 index 6c19175cd..000000000 --- a/floppy.py +++ /dev/null @@ -1,56 +0,0 @@ -# -# floppy.py - floppy drive probe and bootdisk creation -# -# Erik Troan <ewt@redhat.com> -# -# Copyright 2001-2002 Red Hat, Inc. -# -# This software may be freely redistributed under the terms of the GNU -# library public license. -# -# You should have received a copy of the GNU Library Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# - -import kudzu -from constants import * -from flags import flags - -from rhpl.translate import _ - -import logging -log = logging.getLogger("anaconda") - -def hasFloppyDevice(): - try: - for dev in kudzu.probe(kudzu.CLASS_FLOPPY, kudzu.BUS_UNSPEC, - kudzu.PROBE_ALL): - if not dev.detached: - return True - except: - return False - return False - -def probeFloppyDevice(): - fdDevice = "fd0" - - # we now have nifty kudzu code that does all of the heavy lifting - # and properly detects detached floppy drives, ide floppies, and - # even usb floppies - devices = kudzu.probe(kudzu.CLASS_FLOPPY, - kudzu.BUS_IDE | kudzu.BUS_MISC | kudzu.BUS_SCSI, - kudzu.PROBE_ALL) - - if not devices: - log.warning("no floppy devices found but we'll try fd0 anyway") - return fdDevice - - for device in devices: - if device.detached: - continue - log.info("anaconda floppy device %s" % (device.device)) - return device.device - - log.info("anaconda floppy device is %s", fdDevice) - return fdDevice diff --git a/instdata.py b/instdata.py index ea554559a..8c1d1dcbd 100644 --- a/instdata.py +++ b/instdata.py @@ -283,7 +283,7 @@ class InstallData: os.chmod(filename, 0600) - def __init__(self, anaconda, extraModules, floppyDevice, methodstr, displayMode, backend = None): + def __init__(self, anaconda, extraModules, methodstr, displayMode, backend = None): self.displayMode = displayMode self.instLanguage = language.Language(self.displayMode) @@ -297,7 +297,6 @@ class InstallData: self.xsetup = None self.isHeadless = 0 self.extraModules = extraModules - self.floppyDevice = floppyDevice self.fsset = fsset.FileSystemSet() self.methodstr = methodstr |