From cd59bbc1f32c510861ea66b5bcf8cf0887de8bf9 Mon Sep 17 00:00:00 2001 From: Will Woods Date: Thu, 12 May 2011 13:34:02 -0400 Subject: [PATCH] drop efidisk.img from boot.iso on x86 --- share/x86.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/x86.tmpl b/share/x86.tmpl index 95429342..af6e7f4b 100644 --- a/share/x86.tmpl +++ b/share/x86.tmpl @@ -52,7 +52,7 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR} <% 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".format(outroot) + efigraft="EFI/BOOT={0}/EFI/BOOT images/efiboot.img={0}/images/efiboot.img".format(outroot) %> <%include file="efi.tmpl" args="ANABOOTDIR=ANABOOTDIR, KERNELDIR=KERNELDIR, efiarch=efiarch"/> %endif @@ -62,7 +62,7 @@ runcmd mkisofs -o ${outroot}/images/boot.iso \ -boot-load-size 4 -boot-info-table -no-emul-boot \ ${efiargs} -R -J -V '${product.name}' -T -graft-points \ ${BOOTDIR}=${outroot}/${BOOTDIR} \ - images=${outroot}/images \ + ${KERNELDIR}=${outroot}/${KERNELDIR} \ ${efigraft} runcmd isohybrid ${outroot}/images/boot.iso treeinfo images-${basearch} boot.iso images/boot.iso