diff options
| author | Jeremy Katz <katzj@redhat.com> | 2002-04-22 16:27:13 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2002-04-22 16:27:13 +0000 |
| commit | dcc913781c1d7c921b0d06987bcbded4230c3e79 (patch) | |
| tree | e39a6a3fdc7ef61e00eac457ec6c54a43482c377 /bootloader.py | |
| parent | 2627017d67c307ba4b05c66d412d052bfef5437a (diff) | |
| download | anaconda-dcc913781c1d7c921b0d06987bcbded4230c3e79.tar.gz anaconda-dcc913781c1d7c921b0d06987bcbded4230c3e79.tar.xz anaconda-dcc913781c1d7c921b0d06987bcbded4230c3e79.zip | |
merge bootloader changes from HEAD
Diffstat (limited to 'bootloader.py')
| -rw-r--r-- | bootloader.py | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/bootloader.py b/bootloader.py index 5bd484c4b..8cd6cba22 100644 --- a/bootloader.py +++ b/bootloader.py @@ -78,6 +78,21 @@ def writeBootloader(intf, instRoot, fsset, bl, langs, comps): if bl.defaultDevice == -1: return + # now make the upgrade stuff work for kickstart too. ick. + if bl.kickstart == 1 and bl.doUpgradeOnly == 1: + import checkbootloader + (bootType, theDev) = checkbootloader.getBootloaderTypeAndBoot(instRoot) + + bl.doUpgradeonly = 1 + if bootType == "GRUB": + bl.useGrubVal = 1 + bl.setDevice(theDev) + elif bootType == "LILO": + bl.useGrubVal = 0 + bl.setDevice(theDev) + else: + bl.doUpgradeOnly = 0 + w = intf.waitWindow(_("Bootloader"), _("Installing bootloader...")) kernelList = [] |