diff options
author | Jeremy Katz <katzj@redhat.com> | 2003-04-24 15:46:31 +0000 |
---|---|---|
committer | Jeremy Katz <katzj@redhat.com> | 2003-04-24 15:46:31 +0000 |
commit | 0a562126d84c59a113231ae7ab38984f92d62153 (patch) | |
tree | 5e87b9094f4ebdc328979e3a0640dee5f1fc40cb /bootloader.py | |
parent | dd200d781bd9012f562399c2ee69c23fe60d86b9 (diff) | |
download | anaconda-0a562126d84c59a113231ae7ab38984f92d62153.tar.gz anaconda-0a562126d84c59a113231ae7ab38984f92d62153.tar.xz anaconda-0a562126d84c59a113231ae7ab38984f92d62153.zip |
another taroon merge. tagged before as before-taroon-merge, after as
after-taroon-merge
this one adds s390 fixes, basic i/p series platform support, support for
multiple kernels and one second stage, cmdline kickstart mode (nice for s390),
some warning cleanups.
Diffstat (limited to 'bootloader.py')
-rw-r--r-- | bootloader.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/bootloader.py b/bootloader.py index aaa45a285..b9eea2b8e 100644 --- a/bootloader.py +++ b/bootloader.py @@ -54,6 +54,11 @@ def bootloaderSetupChoices(dispatch, bl, fsset, diskSet, dir): log("MBR not suitable as boot device; installing to partition") bl.defaultDevice = "boot" bl.setDevice(choices[bl.defaultDevice][0]) + elif choices and choices.has_key("mbr"): + bl.setDevice(choices["mbr"][0]) + elif choices and choices.has_key("boot"): + bl.setDevice(choices["boot"][0]) + bootDev = fsset.getEntryByMountPoint("/") if not bootDev: |