Added support for LBA32 when we right out lilo.conf iff we need it because boot partition is over 1023 cyl. Also added warning if you put boot > 1023 cyl and we dont seem to be able to detect edd support on this system

5 files changed, 64 insertions, 30 deletions

diff --git a/iw/congrats_gui.py b/iw/congrats_gui.py
index 0075550ad..db758877e 100644
--- a/iw/congrats_gui.py
+++ b/iw/congrats_gui.py
@@ -33,7 +33,7 @@ class CongratulationWindow (InstallWindow):
 	label = GtkLabel(
                      _("Congratulations, installation is complete.\n\n"
                        "Press return to reboot, and be sure to remove your "
-		       "boot medium as the system reboots, or your system "
+		       "boot medium after the system reboots, or your system "
 		       "will rerun the install. For information on fixes which "
                        "are available for this release of Red Hat Linux, "
                        "consult the "
diff --git a/iw/format_gui.py b/iw/format_gui.py
index 6a0526bb4..3595b4386 100644
--- a/iw/format_gui.py
+++ b/iw/format_gui.py
@@ -3,6 +3,7 @@ from iw_gui import *
 from thread import *
 import isys
 from translate import _
+from rootpartition_gui import AutoPartitionWindow
 
 class FormatWindow (InstallWindow):
     def __init__ (self, ics):
diff --git a/iw/installpath_gui.py b/iw/installpath_gui.py
index 0342c32a1..558c5f729 100644
--- a/iw/installpath_gui.py
+++ b/iw/installpath_gui.py
@@ -53,6 +53,7 @@ class InstallPathWindow (InstallWindow):
 		     ( AutoPartitionWindow, "partition" ),
                      FDiskWindow,
 		     ( PartitionWindow, "partition" ),
+                     ( LBA32WarningWindow, "lba32warning"),
 		     ( FormatWindow, "format" ),
 		     ( BootloaderWindow, BootloaderSkipname ),
 		     ( NetworkWindow, "network" ),
@@ -135,17 +136,6 @@ class InstallPathWindow (InstallWindow):
                                        self.todo.expert,
                                        self.todo.upgrade)
 
-###
-### msf - 05-11-2000 - need to move this code!!!!!!
-###            
-#        # set state of disk druid to be read-only if needed
-#        if (InstallPathWindow.fdisk.get_active()):
-#            self.todo.fstab.setReadonly(1)
-#        else:
-#            self.todo.fstab.setReadonly(0)
-#
-#	self.todo.fstab.setRunDruid(InstallPathWindow.fdisk.get_active())
-
     def toggled (self, widget, type):
         if not widget.get_active (): return
         if type == INSTALL:
@@ -220,11 +210,6 @@ class InstallPathWindow (InstallWindow):
 
 	spacer = GtkLabel("")
 	spacer.set_usize(60, 1)
-###
-### msf - 05-11-2000 need to move!!!
-###
-#	InstallPathWindow.fdisk = GtkCheckButton (_("Use fdisk"))
-#	align.add (InstallPathWindow.fdisk)
 
 	align = GtkAlignment ()
 	align.set (0.0, 0.0, 0.0, 0.0)
@@ -240,17 +225,6 @@ class InstallPathWindow (InstallWindow):
 
 	hbox = GtkHBox (FALSE)
 
-        
-###
-### msf - 05-11-2000 need to move!!!
-###
-#	if not InstallPathWindow.__dict__.has_key("fdisk"):
-#	    fdiskState = 0
-#	else:
-#	    fdiskState = InstallPathWindow.fdisk.get_active()
-#
-#	InstallPathWindow.fdisk.set_active(fdiskState)
-
         self.toggled (installButton, INSTALL)
         self.toggled (self.upgradeButton, UPGRADE)
         box.set_border_width (5)
diff --git a/iw/lilo_gui.py b/iw/lilo_gui.py
index 4342cde6a..640af3ab7 100644
--- a/iw/lilo_gui.py
+++ b/iw/lilo_gui.py
@@ -268,8 +268,7 @@ class LiloWindow (InstallWindow):
             _("Use linear mode (needed for some SCSI drives)"))
         self.linearCheck.set_active(self.todo.lilo.getLinear())
 
-	if not edd.detect():
-	    self.radioBox.attach(self.linearCheck, 0, 2, 4, 5)
+        self.radioBox.attach(self.linearCheck, 0, 2, 4, 5)
 
         if not self.todo.lilo.allowLiloLocationConfig(self.todo.fstab):
             self.liloLocationBox.set_sensitive(0)
diff --git a/iw/rootpartition_gui.py b/iw/rootpartition_gui.py
index f145e5ec4..742522a89 100644
--- a/iw/rootpartition_gui.py
+++ b/iw/rootpartition_gui.py
@@ -371,3 +371,63 @@ class AutoPartitionWindow(InstallWindow):
 
 
 
+class LBA32WarningWindow(InstallWindow):
+    def __init__ (self, ics):
+        InstallWindow.__init__ (self, ics)
+        ics.setTitle (_("Boot Partition Location Warning"))
+        ics.readHTML ("lba32warning")
+        self.showing = 0
+
+    def proceedChanged(self, widget, *args):
+        if self.proceed.get_active():
+            self.ics.setNextEnabled (TRUE)
+        else:
+            self.ics.setNextEnabled (FALSE)
+
+    def getScreen (self):
+
+        # check if boot partition is above 1023 cyl limit
+        if iutil.getArch() != "i386":
+            return INSTALL_NOOP
+
+        if self.todo.fstab.getBootPartitionMaxCyl() > 1023 and not self.todo.fstab.edd:
+            vbox = GtkVBox (FALSE, 5)
+            
+            label = GtkLabel (
+                    _("You have put the partition containing the kernel (the "
+                      "boot partition) above the 1023 cylinder limit, and "
+                      "it appears that this systems BIOS does not support "
+                      "booting from above this limit. Proceeding will "
+                      "most likely make the system unable to reboot into "
+                      "Linux.\n\n"
+                      "Are you sure you want to proceed?"))
+
+            label.set_usize (400, -1)
+            label.set_line_wrap (TRUE)
+            label.set_alignment(0.0, 0.0)
+            vbox.pack_start (label, FALSE, FALSE)
+
+            vbox2 = GtkVBox (FALSE, 5)
+            
+            self.proceed = GtkRadioButton (None, _("Yes"))
+            self.proceed.connect("toggled", self.proceedChanged)
+            self.dontproceed = GtkRadioButton (self.proceed, _("No"))
+            self.dontproceed.set_active()
+            self.dontproceed.connect("toggled", self.proceedChanged)
+
+            vbox2.pack_start (self.proceed, FALSE)
+            vbox2.pack_start (self.dontproceed, FALSE)
+            vbox2.set_border_width (25)
+            
+            vbox.pack_start (vbox2, TRUE)
+            vbox.set_border_width (5)
+
+            self.ics.setNextEnabled (FALSE)
+
+            return vbox
+        else:
+            return None
+
+
+
+