diff options
| author | David Lehman <dlehman@redhat.com> | 2012-11-09 15:09:13 -0600 |
|---|---|---|
| committer | Brian C. Lane <bcl@redhat.com> | 2012-11-09 16:05:15 -0800 |
| commit | 4626c66ca2190270d4378b7eb586ec603999dc2e (patch) | |
| tree | b2d879b63867e0acce6115fe1cac898e7ada900f /pyanaconda/bootloader.py | |
| parent | 8439ff0ea4ec52e98ad20d19802c6f8c5fadda22 (diff) | |
| download | anaconda-4626c66ca2190270d4378b7eb586ec603999dc2e.tar.gz anaconda-4626c66ca2190270d4378b7eb586ec603999dc2e.tar.xz anaconda-4626c66ca2190270d4378b7eb586ec603999dc2e.zip | |
Honor kickstart bootloader --location=none. (#871143)
Diffstat (limited to 'pyanaconda/bootloader.py')
| -rw-r--r-- | pyanaconda/bootloader.py | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py index 3dfe42f88..f2c302c58 100644 --- a/pyanaconda/bootloader.py +++ b/pyanaconda/bootloader.py @@ -939,6 +939,9 @@ class BootLoader(object): # def write(self): """ Write the bootloader configuration and install the bootloader. """ + if self.skip_bootloader: + return + if self.update_only: self.update() return @@ -1537,6 +1540,9 @@ class GRUB2(GRUB): def write(self): """ Write the bootloader configuration and install the bootloader. """ + if self.skip_bootloader: + return + if self.update_only: self.update() return @@ -1670,6 +1676,9 @@ class EFIGRUB(GRUB2): # def write(self): """ Write the bootloader configuration and install the bootloader. """ + if self.skip_bootloader: + return + if self.update_only: self.update() return @@ -2238,10 +2247,11 @@ def writeBootLoader(storage, payload, instClass): """ from pyanaconda.errors import errorHandler, ERROR_RAISE - stage1_device = storage.bootloader.stage1_device - log.info("bootloader stage1 target device is %s" % stage1_device.name) - stage2_device = storage.bootloader.stage2_device - log.info("bootloader stage2 target device is %s" % stage2_device.name) + if not storage.bootloader.skip_bootloader: + stage1_device = storage.bootloader.stage1_device + log.info("bootloader stage1 target device is %s" % stage1_device.name) + stage2_device = storage.bootloader.stage2_device + log.info("bootloader stage2 target device is %s" % stage2_device.name) # get a list of installed kernel packages kernel_versions = payload.kernelVersionList @@ -2268,6 +2278,10 @@ def writeBootLoader(storage, payload, instClass): # write out /etc/sysconfig/kernel writeSysconfigKernel(storage, version) + if storage.bootloader.skip_bootloader: + log.info("skipping bootloader install per user request") + return + # now add an image for each of the other kernels for version in kernel_versions: label = "%s-%s" % (base_label, version) |