From ba8e7e69450eece9dbb9f6d30ec43a6f20a75156 Mon Sep 17 00:00:00 2001
From: Will Woods <wwoods@redhat.com>
Date: Tue, 10 May 2011 18:21:18 -0400
Subject: [PATCH] x86.tmpl/efi.tmpl fixups

fix initrd hardlink
splash.xml.gz should be splash.xpm.gz
fix mkisofs args
actually replace vars in isolinux.cfg
---
 share/efi.tmpl |  8 ++++----
 share/x86.tmpl | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/share/efi.tmpl b/share/efi.tmpl
index 9ee64a08..a958b609 100644
--- a/share/efi.tmpl
+++ b/share/efi.tmpl
@@ -3,7 +3,7 @@
 
 mkdir ${EFIBOOTDIR}
 install boot/efi/EFI/redhat/grub.efi ${EFIBOOTDIR}/BOOT${efiarch}.bin
-install boot/grub/splash.xml.gz ${EFIBOOTDIR}
+install boot/grub/splash.xpm.gz ${EFIBOOTDIR}
 
 ## actually make the EFI images
 ${make_efiboot("images/efidisk.img", include_kernel=True, disk=True)}
@@ -18,13 +18,13 @@ ${make_efiboot("images/efiboot.img", include_kernel=False)}
     %>
     %if include_kernel:
         copy ${KERNELDIR}/vmlinuz ${EFIBOOTDIR}
-        copy ${KERNELDIR}/initrd ${EFIBOOTDIR}
+        copy ${KERNELDIR}/initrd.img ${EFIBOOTDIR}
     %endif
     install ${ANABOOTDIR}/grub.conf ${EFIBOOTDIR}/BOOT${efiarch}.conf
     replace @PRODUCT@ ${product.name} ${EFIBOOTDIR}/BOOT${efiarch}.conf
     replace @VERSION@ ${product.version} ${EFIBOOTDIR}/BOOT${efiarch}.conf
     replace @KERNELPATH@ /${kdir}/vmlinuz ${EFIBOOTDIR}/BOOT${efiarch}.conf
-    replace @INITRDPATH@ /${kdir}/initrd ${EFIBOOTDIR}/BOOT${efiarch}.conf
+    replace @INITRDPATH@ /${kdir}/initrd.img ${EFIBOOTDIR}/BOOT${efiarch}.conf
     replace @SPLASHPATH@ /EFI/BOOT/splash.xpm.gz ${EFIBOOTDIR}/BOOT${efiarch}.conf
     %if efiarch == 'IA32':
         copy ${EFIBOOTDIR}/BOOT${efiarch}.conf ${EFIBOOTDIR}/BOOT.conf
@@ -32,6 +32,6 @@ ${make_efiboot("images/efiboot.img", include_kernel=False)}
     runcmd mkefiboot ${args} ${outroot}/${EFIBOOTDIR} ${outroot}/${img}
     %if include_kernel:
         remove ${EFIBOOTDIR}/vmlinuz
-        remove ${EFIBOOTDIR}/initrd
+        remove ${EFIBOOTDIR}/initrd.img
     %endif
 </%def>
diff --git a/share/x86.tmpl b/share/x86.tmpl
index 7cce090b..514f588a 100644
--- a/share/x86.tmpl
+++ b/share/x86.tmpl
@@ -14,8 +14,8 @@ install ${ANABOOTDIR}/*.msg ${BOOTDIR}
 install ${SYSLINUXDIR}/vesamenu.c32 ${BOOTDIR}
 install ${ANABOOTDIR}/grub.conf ${BOOTDIR}
 
-replace @VERSION@ ${product.version} ${BOOTDIR}/*.msg ${BOOTDIR}/grub.conf
-replace @PRODUCT@ ${product.name}    ${BOOTDIR}/grub.conf
+replace @VERSION@ ${product.version} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
+replace @PRODUCT@ ${product.name}    ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
 
 replace "default linux" "default vesamenu.c32" ${BOOTDIR}/isolinux.cfg
 replace "prompt 1"      "#prompt 1"            ${BOOTDIR}/isolinux.cfg
@@ -39,7 +39,7 @@ replace "prompt 1"      "#prompt 1"            ${BOOTDIR}/isolinux.cfg
 %endfor
 
 hardlink ${KERNELDIR}/vmlinuz ${BOOTDIR}
-hardlink ${KERNELDIR}/initrd ${BOOTDIR}
+hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
 %if basearch == 'x86_64':
     treeinfo images-xen kernel ${KERNELDIR}/vmlinuz
     treeinfo images-xen initrd ${KERNELDIR}/initrd.img
@@ -57,10 +57,10 @@ hardlink ${KERNELDIR}/initrd ${BOOTDIR}
     <%include file="efi.tmpl" args="ANABOOTDIR=ANABOOTDIR, KERNELDIR=KERNELDIR, efiarch=efiarch"/>
 %endif
 
-runcmd mkisofs -v -o ${outroot}/images/boot.iso \
+runcmd mkisofs -o ${outroot}/images/boot.iso \
        -b ${BOOTDIR}/isolinux.bin -c ${BOOTDIR}/boot.cat \
-       -boot-load-size 4 -boot-info-table ${efiargs} \
-       -R -J -V '${product.name}' -T -graft-points \
+       -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 \
        ${efigraft}