fix tui bootdisk creation, bug #66176

2 files changed, 7 insertions, 50 deletions

diff --git a/text.py b/text.py
index 31b4cf9a1..693276a11 100644
--- a/text.py
+++ b/text.py
@@ -71,8 +71,7 @@ stepToClasses = {
     "confirminstall" : ("confirm_text", "BeginInstallWindow"),
     "confirmupgrade" : ("confirm_text", "BeginUpgradeWindow"),
     "install" : ("progress_text", "setupForInstall"),
-    "bootdisk" : ("bootdisk_text", ("BootDiskWindow",
-                                    "MakeBootDiskWindow")),
+    "bootdisk" : ("bootdisk_text", ("BootDiskWindow")),
     "complete" : ("complete_text", "FinishedWindow"),
 }
 
diff --git a/textw/bootdisk_text.py b/textw/bootdisk_text.py
index 9afe1e342..68394981f 100644
--- a/textw/bootdisk_text.py
+++ b/textw/bootdisk_text.py
@@ -20,29 +20,13 @@ from constants import *
 class BootDiskWindow:
     def __call__(self, screen, dir, disp, fsset):
 	buttons = [ _("Yes"), _("No") ]
-	text =  _("A custom boot disk provides a way of booting into your "
-		  "Linux system without depending on the normal boot loader. "
-		  "This is useful if you don't want to install lilo on your "
-		  "system, another operating system removes lilo, or lilo "
-		  "doesn't work with your hardware configuration. A custom "
-		  "boot disk can also be used with the Red Hat rescue image, "
-		  "making it much easier to recover from severe system "
-		  "failures.\n\n"
-		  "Would you like to create a boot disk for your system?")
 
-        # need to fix if we get sparc back up
-##	if iutil.getArch () == "sparc":
-##	    floppy = todo.silo.hasUsableFloppy()
-## 	    if floppy == 0:
-## 		todo.bootdisk = 0
-## 		return INSTALL_NOOP
-## 	    text = string.replace (text, "lilo", "silo")
-## 	    if floppy == 1:
-## 		buttons = [ _("No"), _("Yes"), _("Back") ]
-## 		text = string.replace (text, "\n\n",
-## 				       _("\nOn SMCC made Ultra machines "
-##                                          "floppy booting probably does "
-##                                          "not work\n\n"))
+	text = _("The boot disk allows you to boot your %s "
+                 "system from a floppy diskette.  A boot disk "
+		 "allows you to boot your system if your "
+		 "bootloader configuration stops working.\n\nIt is "
+		 "highly recommended you create a boot disk.\n\n"
+		 "Would you like to create a boot disk?") % (productName,)
 
 	rc = ButtonChoiceWindow(screen, _("Boot Disk"), text,
                                 buttons=buttons,
@@ -56,29 +40,3 @@ class BootDiskWindow:
 
 	return INSTALL_OK
 
-class MakeBootDiskWindow:
-    def __call__ (self, screen, dir, disp, fsset):
-        buttons = [ _("OK"), _("Skip") ]
-
-	# This is a bit gross. This lets the first bootdisk screen skip
-	# this one if the user doesn't want to see it.
-	if disp.stepInSkipList("makebootdisk"):
-	    return INSTALL_NOOP
-
-        text = _("The boot disk allows you to boot "
-                 "your %s system from a "
-                 "floppy diskette.\n\n"
-                 "Please remove any diskettes from the "
-                 "floppy drive and insert a blank "
-                 "diskette. All data will be ERASED "
-                 "during creation of the boot disk.") % (productName,)
-
-        rc = ButtonChoiceWindow (screen, _("Boot Disk"),
-                                 text, buttons, help="insertbootdisk")
-
-        if rc == string.lower (_("Skip")):
-	    disp.skipStep("makebootdisk")
-	else:
-	    disp.skipStep("makebootdisk", skip=0)
-            
-        return INSTALL_OK