From 1ec2fe9fbd67d9c4730f72f1d83ebb2896e17267 Mon Sep 17 00:00:00 2001
From: Will Woods <wwoods@redhat.com>
Date: Mon, 31 Oct 2011 14:59:35 -0400
Subject: [PATCH] x86.tmpl: add eltorito alt boot entry for macboot.img

This should allow us to boot the created image on Apple EFI systems.
---
 share/x86.tmpl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/share/x86.tmpl b/share/x86.tmpl
index f5dcc7a3..06fe6f24 100644
--- a/share/x86.tmpl
+++ b/share/x86.tmpl
@@ -50,8 +50,10 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
 %if exists("boot/efi/EFI/redhat/grub.efi") and basearch != 'i386':
     <%
     efiarch = 'X64' if basearch=='x86_64' else 'IA32'
-    efiargs="-eltorito-alt-boot -e images/efiboot.img -no-emul-boot"
-    efigraft="EFI/BOOT={0}/EFI/BOOT images/efiboot.img={0}/images/efiboot.img".format(outroot)
+    efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot)
+    for img in ("images/efiboot.img", "images/macboot.img"):
+        efiargs += " -eltorito-alt-boot -e {0} -no-emul-boot".format(img)
+        efigraft += " {0}={1}/{0}".format(img,outroot)
     efihybrid="-u"
     %>
     <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch=efiarch"/>