mactel-boot-setup needs to be run after install in order to ensure that
Mac-specific bootloader configuration occurs. Make sure this happens.
Bug 816288.
---
pyanaconda/bootloader.py | 13 +++++++++++++
pyanaconda/platform.py | 2 ++
2 files changed, 15 insertions(+)
diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index a2ae434..6ef3840 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -1575,6 +1575,19 @@ class EFIGRUB(GRUB):
self.install()
self.write_config()
+class MacEFIGRUB(EFIGRUB):
+ def mactel_config(self):
+ if os.path.exists(ROOT_PATH + "/usr/libexec/mactel-boot-setup"):
+ rc = iutil.execWithRedirect("/usr/libexec/mactel-boot-setup", [],
+ root=ROOT_PATH,
+ stdout="/dev/tty5", stderr="/dev/tty5")
+ if rc:
+ log.error("failed to configure Mac bootloader")
+
+ def install(self):
+ super(MacEFIGRUB, self).install()
+ self.mactel_config()
+
class GRUB2(GRUB):
""" GRUBv2
diff --git a/pyanaconda/platform.py b/pyanaconda/platform.py
index 0c1f501..296d72a 100644
--- a/pyanaconda/platform.py
+++ b/pyanaconda/platform.py
@@ -219,6 +219,8 @@ class EFI(Platform):
return 0
class MacEFI(EFI):
+ _bootloaderClass = bootloader.MacEFIGRUB
+
_boot_stage1_format_types = ["hfs+"]
_boot_efi_description = N_("Apple EFI Boot Partition")
_non_linux_format_types = ["hfs+"]
--
1.7.10