diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | bootloader.py | 6 | ||||
| -rw-r--r-- | iw/autopart_type.py | 7 |
3 files changed, 20 insertions, 2 deletions
@@ -1,3 +1,12 @@ +2007-09-21 Martin Sivak <msivak@redhat.com> + + * bootloader.py (bootloaderSetupChoices): Honor the "Boot this + instalation from" choice when figuring out the drive order for + bootloader (#243556, #243799). + + * iw/autopart_type.py (PartitionTypeWindow): Show warning when Boot + from media is not allowed in Use this drive for instalation. (#243799) + 2007-09-20 Jeremy Katz <katzj@redhat.com> * livecd.py (LiveCDCopyBackend._doFilesystemMangling): Set label diff --git a/bootloader.py b/bootloader.py index 74aa5e57e..e7d846519 100644 --- a/bootloader.py +++ b/bootloader.py @@ -40,10 +40,12 @@ def bootloaderSetupChoices(anaconda): if flags.livecd: return - if anaconda.id.ksdata: + if anaconda.id.ksdata and anaconda.id.ksdata.bootloader.driveorder: anaconda.id.bootloader.updateDriveList(anaconda.id.ksdata.bootloader.driveorder) else: - anaconda.id.bootloader.updateDriveList() + #We want the selected bootloader drive to be preferred + pref = anaconda.id.bootloader.drivelist[:1] + anaconda.id.bootloader.updateDriveList(pref) # iSeries bootloader on upgrades if iutil.getPPCMachine() == "iSeries" and not anaconda.id.bootloader.device: diff --git a/iw/autopart_type.py b/iw/autopart_type.py index 1e424ce48..7c20fc1c0 100644 --- a/iw/autopart_type.py +++ b/iw/autopart_type.py @@ -78,6 +78,13 @@ class PartitionTypeWindow(InstallWindow): raise gui.StayOnScreen defboot = self.bootcombo.get_model().get_value(defiter, 1) + + if not defboot in allowdrives: + msg = _("Do you really want to boot from disk which is not used for instalation?") + rc = self.intf.messageWindow(_("Warning"), msg, type="yesno", default="no", custom_icon ="warning") + if not rc: + raise gui.StayOnScreen + self.anaconda.id.bootloader.drivelist.remove(defboot) self.anaconda.id.bootloader.drivelist.insert(0, defboot) |