diff options
| author | msivak <msivak> | 2007-09-21 06:44:24 +0000 |
|---|---|---|
| committer | msivak <msivak> | 2007-09-21 06:44:24 +0000 |
| commit | d118fea3d127d1be2e4fee8b69dae7b59f37d6db (patch) | |
| tree | 5d72423045f89ade34bf1ada35649b60424e28c1 /bootloader.py | |
| parent | f3f7ac8f14510c96da77cf5c212bb41e973320f4 (diff) | |
| download | anaconda-d118fea3d127d1be2e4fee8b69dae7b59f37d6db.tar.gz anaconda-d118fea3d127d1be2e4fee8b69dae7b59f37d6db.tar.xz anaconda-d118fea3d127d1be2e4fee8b69dae7b59f37d6db.zip | |
Unsafe bootloader defaults (#243556, #243799)
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)
Diffstat (limited to 'bootloader.py')
| -rw-r--r-- | bootloader.py | 6 |
1 files changed, 4 insertions, 2 deletions
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: |