Remove unused floppy device code. Use hasFloppyDevice instead of

duplicating device counting code.

1 files changed, 2 insertions, 150 deletions

diff --git a/floppy.py b/floppy.py
index ac919fea0..16dd9cd47 100644
--- a/floppy.py
+++ b/floppy.py
@@ -30,15 +30,12 @@ log = logging.getLogger("anaconda")
 
 def hasFloppyDevice():
     try:
-        floppyDevices = 0
         for dev in kudzu.probe(kudzu.CLASS_FLOPPY, kudzu.BUS_UNSPEC,
                                kudzu.PROBE_ALL):
             if not dev.detached:
-                floppyDevices = floppyDevices + 1
+                return True
     except:
-        floppyDevices = 0
-
-    return floppyDevices
+        return False
 
 def probeFloppyDevice():
     fdDevice = "fd0"
@@ -62,148 +59,3 @@ def probeFloppyDevice():
     
     log.info("anaconda floppy device is %s", fdDevice)
     return fdDevice
-
-def makeBootdisk (intf, dir, floppyDevice, grpset, instPath, bootloader):
-    if dir == DISPATCH_BACK:
-	return DISPATCH_NOOP
-    
-    if flags.test:
-	return DISPATCH_NOOP
-
-    kernel = grpset.hdrlist['kernel']
-    kernelTag = "-%s-%s" % (kernel[rpm.RPMTAG_VERSION],
-			    kernel[rpm.RPMTAG_RELEASE])
-
-
-    # FIXME: if other arches had working boot disks, we wouldn't be able
-    # to hardcode /boot
-    kernel = "%s/boot/vmlinuz%s" %(instPath, kernelTag)
-    size = 0
-    if os.access(kernel, os.R_OK):
-        try:
-            kernelsize = os.stat(kernel)[stat.ST_SIZE]
-            log.info("kernelsize is %s" %(kernelsize,))
-        except:
-            kernelsize = 0
-        size = size + kernelsize
-        
-    initrd = "%s/boot/initrd%s.img" %(instPath, kernelTag)
-    if os.access(initrd, os.R_OK):
-        try:
-            initrdsize = os.stat(initrd)[stat.ST_SIZE]
-            log.info("initrdsize is %s" %(initrdsize,))
-        except:
-            initrdsize = 0
-        size = size + initrdsize
-
-    log.info("boot floppy size is %s" %(size,))
-
-    # go within 10 K of the size of the boot disk to have a tad
-    # bit of safety.  if this fails, we're no worse off than we used
-    # to be.
-    if size >= 1416 * 1024:
-        intf.messageWindow(_("Unable to make boot floppy"),
-                           _("The size of the kernel modules needed "
-                             "for your machine make it impossible to "
-                             "create a boot disk that will fit on a "
-                             "floppy diskette."),
-                           type = "warning")
-        return DISPATCH_NOOP
-
-    
-
-    rc = intf.messageWindow( _("Insert a floppy disk"),
-			_("Please remove any diskettes from the floppy "
-			  "drive, and insert the floppy diskette that "
-			  "is to contain the boot disk.\n\nAll data will "
-			  "be ERASED during creation of the boot disk."),
-			type="custom", custom_buttons=[_("_Cancel"), _("_Make boot disk")])
-
-    if not rc:
-	return DISPATCH_NOOP
-    
-    # this is faster then waiting on mkbootdisk to fail
-    device = floppyDevice
-    isys.makeDevInode(device, "/tmp/floppy")
-    try:
-	fd = os.open("/tmp/floppy", os.O_RDONLY)
-    except:
-        intf.messageWindow( _("Error"),
-		    _("An error occurred while making the boot disk. "
-		      "Please make sure that there is a floppy "
-		      "in the first floppy drive."))
-	return DISPATCH_BACK
-    os.close(fd)
-
-    if bootloader.args.get():
-        args = bootloader.args.get()
-    else:
-        args = ""
-
-    w = intf.waitWindow (_("Creating"), _("Creating boot disk..."))
-    rc = iutil.execWithRedirect("/sbin/mkbootdisk",
-				[ "/sbin/mkbootdisk",
-                                  "--kernelargs", args,
-				  "--noprompt",
-				  "--device",
-				  "/dev/" + floppyDevice,
-				  kernelTag[1:] ],
-				stdout = '/dev/tty5', stderr = '/dev/tty5',
-				searchPath = 1, root = instPath)
-    w.pop()
-
-    if rc:
-        intf.messageWindow( _("Error"),
-		    _("An error occurred while making the boot disk. "
-		      "Please make sure that there is a floppy "
-		      "in the first floppy drive."))
-	return DISPATCH_BACK
-
-
-    # more sanity checking -- see if the initrd size and kernel size
-    # match what we thought they would be
-    device = floppyDevice
-    file = "/tmp/floppy"
-    isys.makeDevInode(device, file)
-    try:
-        isys.mount("/tmp/floppy", "/mnt/floppy", "vfat")
-    except:
-        intf.messageWindow(_("Error"),
-                           _("An error occurred while attempting to verify "
-                             "the boot disk.  Please make sure that you "
-                             "have a good floppy in the first floppy drive."))
-        return DISPATCH_BACK
-
-    problem = 0
-    if os.access("/mnt/floppy/vmlinuz", os.R_OK):
-        if kernelsize != 0:
-            size = os.stat("/mnt/floppy/vmlinuz")[stat.ST_SIZE]
-            if size != kernelsize:
-                problem = 1
-        else:
-            log.warning("unable to verify kernel size.  hope it fit!")
-    else:
-        problem = 1
-
-    if initrdsize != 0:
-        if os.access("/mnt/floppy/initrd.img", os.R_OK):
-            size = os.stat("/mnt/floppy/initrd.img")[stat.ST_SIZE]
-            if size != initrdsize:
-                problem = 1
-        else:
-            problem = 1
-
-    try:
-        isys.umount("/mnt/floppy")
-    except:
-        pass
-
-    if problem == 1:    
-        intf.messageWindow(_("Error"),
-                           _("Your boot floppy appears to be invalid.  This "
-                             "is likely due to a bad floppy.  Please make "
-                             "sure that you have a good floppy in the "
-                             "first floppy drive."))
-        return DISPATCH_BACK
-    
-    return DISPATCH_FORWARD