diff options
| author | Mike Fulbright <msf@redhat.com> | 2001-01-09 17:51:13 +0000 |
|---|---|---|
| committer | Mike Fulbright <msf@redhat.com> | 2001-01-09 17:51:13 +0000 |
| commit | e9900a35878dba46a8c6e82dd481ba0f60ad62dd (patch) | |
| tree | f4d717e2cdee4cb80ea91d9dabffe8868287061a | |
| parent | 97db4bcdc67dc88b3db4405d868f6d97f9a1b276 (diff) | |
| download | anaconda-e9900a35878dba46a8c6e82dd481ba0f60ad62dd.tar.gz anaconda-e9900a35878dba46a8c6e82dd481ba0f60ad62dd.tar.xz anaconda-e9900a35878dba46a8c6e82dd481ba0f60ad62dd.zip | |
slight changes to lba32warning
| -rw-r--r-- | iw/rootpartition_gui.py | 6 | ||||
| -rw-r--r-- | textw/partitioning_text.py | 37 |
2 files changed, 29 insertions, 14 deletions
diff --git a/iw/rootpartition_gui.py b/iw/rootpartition_gui.py index 743cc552b..97d9d8217 100644 --- a/iw/rootpartition_gui.py +++ b/iw/rootpartition_gui.py @@ -394,7 +394,7 @@ class LBA32WarningWindow(InstallWindow): vbox = GtkVBox (FALSE, 5) - if not self.todo.fstab.edd or 1: + if not self.todo.fstab.edd: label = GtkLabel ( _("You have put the partition containing the kernel (the " "boot partition) above the 1023 cylinder limit, and " @@ -415,7 +415,7 @@ class LBA32WarningWindow(InstallWindow): "booting from above this limit. \n\n" "It is HIGHLY recommended you make a boot floppy when " "asked by the installer, as this is a new feature in " - "recent motherboard and is not always reliable. " + "recent motherboards and is not always reliable. " "Making a boot disk will guarantee you can boot " "your system once installed.")) @@ -424,7 +424,7 @@ class LBA32WarningWindow(InstallWindow): label.set_alignment(0.0, 0.0) vbox.pack_start (label, FALSE, FALSE) - if not self.todo.fstab.edd or 1: + if not self.todo.fstab.edd: vbox2 = GtkVBox (FALSE, 5) self.proceed = GtkRadioButton (None, _("Yes")) diff --git a/textw/partitioning_text.py b/textw/partitioning_text.py index e0230b367..8a341102f 100644 --- a/textw/partitioning_text.py +++ b/textw/partitioning_text.py @@ -351,25 +351,40 @@ class LBA32WarningWindow: if iutil.getArch() != "i386": return INSTALL_NOOP - ButtonChoiceWindow(screen, "", "%s" % todo.fstab.getBootPartitionMaxCyl(), - buttons = [ _("OK") ]) - - if todo.fstab.getBootPartitionMaxCyl() > 1023 and not todo.fstab.edd: - rc = ButtonChoiceWindow(screen, _("Boot Partition Warning"), - _("You have put the partition containing the kernel (the " + if todo.fstab.getBootPartitionMaxCyl() > 1023: + if not todo.fstab.edd: + rc = ButtonChoiceWindow(screen, _("Boot Partition Warning"), + _("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" + "If you choose to proceed, it is HIGHLY recommended " + "you make a boot floppy when asked. This will " + "guarantee you have a way to boot into the system " + "after installation.\n\n" "Are you sure you want to proceed?"), - [ (_("Yes"), "yes") , (_("No"), "no") ], width = 50, - help = "lba32warning") + [ (_("Yes"), "yes") , (_("No"), "no") ], width = 50, + help = "lba32warning") - if rc == "no": - return INSTALL_BACK + if rc == "no": + return INSTALL_BACK + else: + return INSTALL_OK else: - return INSTALL_OK + rc = ButtonChoiceWindow(screen, _("Boot Partition Warning"), + _("You have put the partition containing the kernel (the " + "boot partition) above the 1023 cylinder limit. " + "It appears that this systems BIOS supports " + "booting from above this limit. \n\n" + "It is HIGHLY recommended you make a boot floppy when " + "asked by the installer, as this is a new feature in " + "recent motherboards and is not always reliable. " + "Making a boot disk will guarantee you can boot " + "your system once installed."), + [ (_("Ok"), "ok") ], width = 50, + help = "lba32warning") else: return INSTALL_NOOP |