diff --git a/80-rhel/efi.tmpl b/80-rhel/efi.tmpl index bb1aa4f..3cb3b2e 100644 --- a/80-rhel/efi.tmpl +++ b/80-rhel/efi.tmpl @@ -21,9 +21,6 @@ install boot/grub2/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/ ## actually make the EFI images ${make_efiboot("images/efiboot.img")} -%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')"> @@ -32,7 +29,6 @@ ${make_efiboot("images/efiboot.img")} eficonf = "%s/grub.cfg" % (EFIBOOTDIR, ) args = "--label=ANACONDA --debug" if disk: args += " --disk" - if imgtype == "apple": args += ' --apple --icon=%s --diskname=%s --product="%s %s"' % (APPLE_EFI_ICON, APPLE_EFI_DISKNAME, product.name, product.version) %> %if include_kernel: copy ${KERNELDIR}/vmlinuz ${EFIBOOTDIR} diff --git a/80-rhel/x86.tmpl b/80-rhel/x86.tmpl index 7334788..a21f5a8 100644 --- a/80-rhel/x86.tmpl +++ b/80-rhel/x86.tmpl @@ -87,17 +87,7 @@ treeinfo images-${basearch} eltorito.img images/eltorito.img %if (efiarch32 or efiarch64) and basearch != 'i386': <% efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot) - images = [("images/efiboot.img", "-isohybrid-gpt-basdat")] - if domacboot: - images.append(("images/macboot.img", "-isohybrid-gpt-hfsplus")) %> - %for img, hybrid in images: - <% - efiargs += " --efi-boot {0} {1}".format(img, hybrid) - efigraft += " {0}={1}/{0}".format(img,outroot) - %> - treeinfo images-${basearch} ${img|basename} ${img} - %endfor <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel"/> %endif