diff options
Diffstat (limited to 'bootloader.py')
| -rw-r--r-- | bootloader.py | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/bootloader.py b/bootloader.py index b3de4adf7..6b455e1d1 100644 --- a/bootloader.py +++ b/bootloader.py @@ -365,6 +365,7 @@ class x86BootloaderInfo: self.useGrubVal = 1 # use lilo otherwise self.device = None self.useLinear = 1 # only used for kickstart compatibility + self.setDefaultDevice = 0 # XXX hack, used by kickstart def availableBootDevices(diskSet, fsset): devs = [] @@ -388,7 +389,17 @@ def availableBootDevices(diskSet, fsset): return devs -def partitioningComplete(dispatch, bl, fsset, diskSet): +# XXX move me somewhere else and split the bootloader and fsset parts +# into different functions +def partitioningComplete(dispatch, bl, fsset, diskSet, partitions): + fsset.reset() + for request in partitions.requests: + # XXX improve sanity checking + if not request.fstype or (request.fstype.isMountable() and not request.mountpoint): + continue + entry = request.toEntry() + fsset.add (entry) + choices = fsset.bootloaderChoices(diskSet) if not choices: dispatch.skipStep("instbootloader") @@ -397,6 +408,10 @@ def partitioningComplete(dispatch, bl, fsset, diskSet): bl.images.setup(diskSet, fsset) + if bl.setDefaultDevice and choices: + bl.setDevice(choices[0][0]) + + def writeBootloader(intf, instRoot, fsset, bl, langs, comps): justConfigFile = not flags.setupFilesystems |