From 44dc8e0278422729a2ce50fcbb59b4f9d8f9befd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Thu, 17 Sep 2015 13:34:55 +0200
Subject: [PATCH] lorax: do not create macboot.img - it will be too big anyway

---
 lorax-templates-qubes/templates/efi.tmpl | 7 ++-----
 lorax-templates-qubes/templates/x86.tmpl | 4 +---
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/lorax-templates-qubes/templates/efi.tmpl b/lorax-templates-qubes/templates/efi.tmpl
index 7e79d73..8a1b9c4 100644
--- a/lorax-templates-qubes/templates/efi.tmpl
+++ b/lorax-templates-qubes/templates/efi.tmpl
@@ -9,17 +9,14 @@ APPLE_EFI_DISKNAME=inroot+"/usr/share/pixmaps/bootloader/fedora-media.vol"
 mkdir ${EFIBOOTDIR}
 mkdir ${EFIBOOTDIR}/fonts/
 install boot/efi/EFI/*/gcd${efiarch|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch}.efi
-# keep also under original name to make mkefiboot --apple happy
-install boot/efi/EFI/*/gcd${efiarch|lower}.efi ${EFIBOOTDIR}/grub${efiarch|lower}.efi
+## keep also under original name to make mkefiboot --apple happy
+##install boot/efi/EFI/*/gcd${efiarch|lower}.efi ${EFIBOOTDIR}/grub${efiarch|lower}.efi
 install boot/efi/EFI/*/xen*.efi ${EFIBOOTDIR}/xen.efi
 install boot/efi/EFI/*/MokManager.efi ${EFIBOOTDIR}/
 install boot/efi/EFI/*/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/
 
 ## actually make the EFI images
 ${make_efiboot("images/efiboot.img", include_kernel=True)}
-%if domacboot:
-    ${make_efiboot("images/macboot.img", imgtype="apple")}
-%endif
 
 ## This is kinda gross, but then... so's EFI.
 <%def name="make_efiboot(img, include_kernel=False, disk=False, imgtype='default')">
diff --git a/lorax-templates-qubes/templates/x86.tmpl b/lorax-templates-qubes/templates/x86.tmpl
index d89aeca..52e59d1 100644
--- a/lorax-templates-qubes/templates/x86.tmpl
+++ b/lorax-templates-qubes/templates/x86.tmpl
@@ -100,12 +100,10 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
     efiarch = 'X64' if basearch=='x86_64' else 'IA32'
     efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot)
     images = ["images/efiboot.img"]
-    if domacboot:
-        images.append("images/macboot.img")
     for img in images:
         efiargs += " -eltorito-alt-boot -e {0} -no-emul-boot".format(img)
         efigraft += " {0}={1}/{0}".format(img,outroot)
-    efihybrid = "--uefi --mac" if domacboot else "--uefi"
+    efihybrid = "--uefi"
     %>
     <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch=efiarch, isolabel=isolabel, kver=latestkver"/>
 %endif