From 9c6b897b011de097ba37c6e38c75371623f2bfab Mon Sep 17 00:00:00 2001
From: Martin Kolman <mkolman@redhat.com>
Date: Nov 02 2017 19:48:52 +0000
Subject: Fix Mac EFI - second try


- Really install all the right packages on Mac UEFI installs (adamw)

---

diff --git a/0006-Fix-MAC-EFI-try-2.patch b/0006-Fix-MAC-EFI-try-2.patch
new file mode 100644
index 0000000..2fbde5a
--- /dev/null
+++ b/0006-Fix-MAC-EFI-try-2.patch
@@ -0,0 +1,30 @@
+From 2f8bb461055af7db8879429907db1ecdb1dbecd4 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Thu, 2 Nov 2017 09:53:08 -0700
+Subject: [PATCH] Really install all the right packages on Mac UEFI installs
+
+My previous fix still wasn't quite right - it overrode the
+EFIGRUB `_packages64` list so those packages, which are needed,
+weren't included. So let's *add* to that list, not replace it.
+Note we have to put this in `__init__` because we can't use
+`super()` from the class block, that just flat doesn't work.
+---
+ pyanaconda/bootloader.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
+index 1e86c9769b..f004e2f6e5 100644
+--- a/pyanaconda/bootloader.py
++++ b/pyanaconda/bootloader.py
+@@ -1862,7 +1862,10 @@ class Aarch64EFIGRUB(EFIGRUB):
+     _efi_binary = "\\shimaa64.efi"
+ 
+ class MacEFIGRUB(EFIGRUB):
+-    _packages64 = [ "grub2-tools-efi", "mactel-boot" ]
++    def __init__(self):
++        super(MacEFIGRUB, self).__init__()
++        self._packages64 = super(MacEFIGRUB, self)._packages64 + ["grub2-tools-efi", "mactel-boot"]
++
+     def mactel_config(self):
+         if os.path.exists(iutil.getSysroot() + "/usr/libexec/mactel-boot-setup"):
+             rc = iutil.execInSysroot("/usr/libexec/mactel-boot-setup", [])
diff --git a/anaconda.spec b/anaconda.spec
index 3ef3cd5..43ff77b 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -3,7 +3,7 @@
 Summary: Graphical system installer
 Name:    anaconda
 Version: 27.20.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and MIT
 Group:   Applications/System
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -21,7 +21,7 @@ Patch1: 0001-network-create-default-ifcfg-also-for-missing-defaul.patch
 # fix Mac EFI
 Patch2: 0002-Mac-EFI-installs-need-grub2-tools-1503496.patch
 
-# fix being unable to continue installation without selecting 
+# fix being unable to continue installation without selecting
 # and add-ons in TUI
 Patch3: 0003-Add-logging-to-TUI-software-selection-spoke-1505090.patch
 Patch4: 0004-Fix-changing-source-don-t-erase-old-environment-TUI-.patch
@@ -29,6 +29,9 @@ Patch4: 0004-Fix-changing-source-don-t-erase-old-environment-TUI-.patch
 # fix closest source selection for modular F27
 Patch5: 0005-Add-modular-server-repo-to-the-base-repositories-150.patch
 
+# Second attempt to fix Mac EFI
+Patch6: 0006-Fix-MAC-EFI-try-2.patch
+
 # Versions of required components (done so we make sure the buildrequires
 # match the requires versions of things).
 
@@ -258,6 +261,7 @@ runtime on NFS/HTTP/FTP servers or local disks.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %configure
@@ -351,6 +355,9 @@ update-desktop-database &> /dev/null || :
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+* Thu Nov 02 2017 Martin Kolman <mkolman@redhat.com> - 27.20.4-4
+- Really install all the right packages on Mac UEFI installs (adamw)
+
 * Mon Oct 30 2017 Martin Kolman <mkolman@redhat.com> - 27.20.4-3
 - Add logging to TUI software selection spoke (#1505090) (jkonecny)
 - Fix changing source don't erase old environment TUI (#1505090) (jkonecny)