diff options
| author | Peter Jones <pjones@redhat.com> | 2012-09-05 12:17:49 -0400 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2012-09-05 17:04:52 -0400 |
| commit | a45feda27c2e9b5ba42b36009f1e040018e95803 (patch) | |
| tree | b0cba27e3c50abd212b1e1e323771bb70cde6108 /pyanaconda/bootloader.py | |
| parent | c1c1811764c064a83efc7fa273d401535f65b19f (diff) | |
| download | anaconda-a45feda27c2e9b5ba42b36009f1e040018e95803.tar.gz anaconda-a45feda27c2e9b5ba42b36009f1e040018e95803.tar.xz anaconda-a45feda27c2e9b5ba42b36009f1e040018e95803.zip | |
Don't depend on storage or instClass in EFIGRUB
Resolves: rhbz#853308
Diffstat (limited to 'pyanaconda/bootloader.py')
| -rw-r--r-- | pyanaconda/bootloader.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py index e9ffbf1a6..22e4031eb 100644 --- a/pyanaconda/bootloader.py +++ b/pyanaconda/bootloader.py @@ -1551,7 +1551,11 @@ class EFIGRUB(GRUB2): @property def _config_dir(self): - return "efi/EFI/%s" % (self.storage.anaconda.instClass.efi_dir,) + return "efi/EFI/%s" % (self.efi_dir,) + + def __init__(self, platform=None): + super(EFIGRUB, self).__init__(platform=platform) + self.efi_dir = 'BOOT' def efibootmgr(self, *args, **kwargs): if kwargs.pop("capture", False): @@ -2132,7 +2136,7 @@ def writeSysconfigKernel(storage, version): f.write("DEFAULTKERNEL=%s\n" % kernel) f.close() -def writeBootLoader(storage, payload): +def writeBootLoader(storage, payload, instClass): """ Write bootloader configuration to disk. When we get here, the bootloader will already have a default linux @@ -2165,6 +2169,8 @@ def writeBootLoader(storage, payload): short=base_short_label) storage.bootloader.add_image(default_image) storage.bootloader.default = default_image + if hasattr(storage.bootloader, 'efi_dir'): + storage.bootloader.efi_dir = instClass.efi_dir # write out /etc/sysconfig/kernel writeSysconfigKernel(storage, version) |