diff options
| author | Jeremy Katz <katzj@redhat.com> | 2002-08-02 08:22:57 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2002-08-02 08:22:57 +0000 |
| commit | 5a17bf019b3c051bd47918244f18efdfb5de3653 (patch) | |
| tree | fdcc67270b6551eed458f0bc0ce7b6a822180904 /bootloader.py | |
| parent | d5e648872e559eb79120bff350e8d96ce3b734e1 (diff) | |
| download | anaconda-5a17bf019b3c051bd47918244f18efdfb5de3653.tar.gz anaconda-5a17bf019b3c051bd47918244f18efdfb5de3653.tar.xz anaconda-5a17bf019b3c051bd47918244f18efdfb5de3653.zip | |
fix mbr/partition handling for kickstart (#70380)
Diffstat (limited to 'bootloader.py')
| -rw-r--r-- | bootloader.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bootloader.py b/bootloader.py index 7e3ebfeb3..e834fb5ce 100644 --- a/bootloader.py +++ b/bootloader.py @@ -45,13 +45,13 @@ def bootloaderSetupChoices(dispatch, bl, fsset, diskSet, dir): bl.images.setup(diskSet, fsset) - # XXX fix mbr vs boot handling here if bl.defaultDevice != None and choices: keys = choices.keys() -# if bl.defaultDevice > len(keys) - if "mbr" in keys: - bl.defaultDevice = "mbr" - else: + # there are only two possible things that can be in the keys + # mbr and boot. boot is ALWAYS present. so if the dev isn't + # listed, it was mbr and we should nicely fall back to boot + if bl.defaultDevice not in keys: + log("MBR not suitable as boot device; installing to partition") bl.defaultDevice = "boot" bl.setDevice(choices[bl.defaultDevice][0]) |