diff --git a/lorax-templates-qubes/templates/x86.tmpl b/lorax-templates-qubes/templates/x86.tmpl index ebdc2f9..12f73bd 100644 --- a/lorax-templates-qubes/templates/x86.tmpl +++ b/lorax-templates-qubes/templates/x86.tmpl @@ -88,23 +88,23 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR} %endif %endif -## WHeeeeeeee, EFI. -## We could remove the basearch restriction someday.. -<% efiargs=""; efigraft=""; efihybrid="" %> -%if exists("boot/efi/EFI/fedora/gcdx64.efi") and basearch != 'i386': - <% - 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" - %> - <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch=efiarch, isolabel=isolabel"/> -%endif +## ## WHeeeeeeee, EFI. +## ## We could remove the basearch restriction someday.. +## <% efiargs=""; efigraft=""; efihybrid="" %> +## %if exists("boot/efi/EFI/fedora/gcdx64.efi") and basearch != 'i386': +## <% +## 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" +## %> +## <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch=efiarch, isolabel=isolabel"/> +## %endif ## ## make boot.iso ## runcmd mkisofs -o ${outroot}/images/boot.iso \