From 45ee5bf23b828a78c6b2005719300792b76319cf Mon Sep 17 00:00:00 2001
From: Daniel Mach <dmach@redhat.com>
Date: Wed, 9 May 2012 12:27:20 +0200
Subject: [PATCH] Disable macboot.img on RHEL

---
 lorax-disable-macboot-img.patch | 27 +++++++++++++++++++++++++++
 lorax.spec                      | 10 +++++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 lorax-disable-macboot-img.patch

diff --git a/lorax-disable-macboot-img.patch b/lorax-disable-macboot-img.patch
new file mode 100644
index 00000000..e32f2c2a
--- /dev/null
+++ b/lorax-disable-macboot-img.patch
@@ -0,0 +1,27 @@
+diff -Naur a/share/efi.tmpl b/share/efi.tmpl
+--- a/share/efi.tmpl	2012-01-12 16:05:52.000000000 +0100
++++ b/share/efi.tmpl	2012-01-13 12:23:47.238239411 +0100
+@@ -10,7 +10,6 @@
+ 
+ ## actually make the EFI images
+ ${make_efiboot("images/efiboot.img")}
+-${make_efiboot("images/macboot.img", imgtype="apple")}
+ 
+ ## This is kinda gross, but then... so's EFI.
+ <%def name="make_efiboot(img, include_kernel=False, disk=False, imgtype='default')">
+diff -Naur a/share/x86.tmpl b/share/x86.tmpl
+--- a/share/x86.tmpl	2012-01-12 16:05:52.000000000 +0100
++++ b/share/x86.tmpl	2012-01-13 14:10:04.168384841 +0100
+@@ -53,10 +53,10 @@
+     <%
+     efiarch = 'X64' if basearch=='x86_64' else 'IA32'
+     efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot)
+-    for img in ("images/efiboot.img", "images/macboot.img"):
++    for img in ("images/efiboot.img", ):
+         efiargs += " -eltorito-alt-boot -e {0} -no-emul-boot".format(img)
+         efigraft += " {0}={1}/{0}".format(img,outroot)
+-    efihybrid="--uefi --mac"
++    efihybrid="--uefi"
+     %>
+     <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch=efiarch"/>
+ %endif
diff --git a/lorax.spec b/lorax.spec
index 8691bcef..55c986c5 100644
--- a/lorax.spec
+++ b/lorax.spec
@@ -2,13 +2,14 @@
 
 Name:           lorax
 Version:        17.18
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tool for creating the anaconda install images
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://git.fedorahosted.org/git/?p=lorax.git
 Source0:        https://fedorahosted.org/releases/l/o/%{name}/%{name}-%{version}.tar.bz2
+Patch0:         lorax-disable-macboot-img.patch
 
 BuildRequires:  python2-devel
 Requires:       python-mako
@@ -57,6 +58,10 @@ Anaconda's image install feature.
 
 %prep
 %setup -q
+# disable macboot.img on RHEL
+%if 0%{?rhel}
+%patch0 -p1
+%endif
 
 %build
 
@@ -79,6 +84,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 
 %changelog
+* Wed May 09 2012 Daniel Mach <dmach@redhat.com> 17.18-2
+- Disable macboot.img on RHEL
+
 * Tue May 08 2012 Brian C. Lane <bcl@redhat.com> 17.18-1
 - stop moving /run (#818918) (bcl)