almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

x86.tmpl/efi.tmpl fixups

Browse Source 
fix initrd hardlink
splash.xml.gz should be splash.xpm.gz
fix mkisofs args
actually replace vars in isolinux.cfg
This commit is contained in:
Will Woods 2011-05-10 18:21:18 -04:00
parent e77f142847
commit ba8e7e6945
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
share/efi.tmpl
View File

@ -3,7 +3,7 @@
mkdir ${EFIBOOTDIR} mkdir ${EFIBOOTDIR}
install boot/efi/EFI/redhat/grub.efi ${EFIBOOTDIR}/BOOT${efiarch}.bin 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 ## actually make the EFI images
${make_efiboot("images/efidisk.img", include_kernel=True, disk=True)} ${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: %if include_kernel:
copy ${KERNELDIR}/vmlinuz ${EFIBOOTDIR} copy ${KERNELDIR}/vmlinuz ${EFIBOOTDIR}
copy ${KERNELDIR}/initrd ${EFIBOOTDIR} copy ${KERNELDIR}/initrd.img ${EFIBOOTDIR}
%endif %endif
install ${ANABOOTDIR}/grub.conf ${EFIBOOTDIR}/BOOT${efiarch}.conf install ${ANABOOTDIR}/grub.conf ${EFIBOOTDIR}/BOOT${efiarch}.conf
replace @PRODUCT@ ${product.name} ${EFIBOOTDIR}/BOOT${efiarch}.conf replace @PRODUCT@ ${product.name} ${EFIBOOTDIR}/BOOT${efiarch}.conf
replace @VERSION@ ${product.version} ${EFIBOOTDIR}/BOOT${efiarch}.conf replace @VERSION@ ${product.version} ${EFIBOOTDIR}/BOOT${efiarch}.conf
replace @KERNELPATH@ /${kdir}/vmlinuz ${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 replace @SPLASHPATH@ /EFI/BOOT/splash.xpm.gz ${EFIBOOTDIR}/BOOT${efiarch}.conf
%if efiarch == 'IA32': %if efiarch == 'IA32':
copy ${EFIBOOTDIR}/BOOT${efiarch}.conf ${EFIBOOTDIR}/BOOT.conf 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} runcmd mkefiboot ${args} ${outroot}/${EFIBOOTDIR} ${outroot}/${img}
%if include_kernel: %if include_kernel:
remove ${EFIBOOTDIR}/vmlinuz remove ${EFIBOOTDIR}/vmlinuz
remove ${EFIBOOTDIR}/initrd remove ${EFIBOOTDIR}/initrd.img
%endif %endif
</%def> </%def>

12
share/x86.tmpl
View File

@ -14,8 +14,8 @@ install ${ANABOOTDIR}/*.msg ${BOOTDIR}
install ${SYSLINUXDIR}/vesamenu.c32 ${BOOTDIR} install ${SYSLINUXDIR}/vesamenu.c32 ${BOOTDIR}
install ${ANABOOTDIR}/grub.conf ${BOOTDIR} install ${ANABOOTDIR}/grub.conf ${BOOTDIR}
replace @VERSION@ ${product.version} ${BOOTDIR}/*.msg ${BOOTDIR}/grub.conf replace @VERSION@ ${product.version} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
replace @PRODUCT@ ${product.name} ${BOOTDIR}/grub.conf replace @PRODUCT@ ${product.name} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
replace "default linux" "default vesamenu.c32" ${BOOTDIR}/isolinux.cfg replace "default linux" "default vesamenu.c32" ${BOOTDIR}/isolinux.cfg
replace "prompt 1" "#prompt 1" ${BOOTDIR}/isolinux.cfg replace "prompt 1" "#prompt 1" ${BOOTDIR}/isolinux.cfg
@ -39,7 +39,7 @@ replace "prompt 1" "#prompt 1" ${BOOTDIR}/isolinux.cfg
%endfor %endfor
hardlink ${KERNELDIR}/vmlinuz ${BOOTDIR} hardlink ${KERNELDIR}/vmlinuz ${BOOTDIR}
hardlink ${KERNELDIR}/initrd ${BOOTDIR} hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
%if basearch == 'x86_64': %if basearch == 'x86_64':
treeinfo images-xen kernel ${KERNELDIR}/vmlinuz treeinfo images-xen kernel ${KERNELDIR}/vmlinuz
treeinfo images-xen initrd ${KERNELDIR}/initrd.img 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"/> <%include file="efi.tmpl" args="ANABOOTDIR=ANABOOTDIR, KERNELDIR=KERNELDIR, efiarch=efiarch"/>
%endif %endif
runcmd mkisofs -v -o ${outroot}/images/boot.iso \ runcmd mkisofs -o ${outroot}/images/boot.iso \
-b ${BOOTDIR}/isolinux.bin -c ${BOOTDIR}/boot.cat \ -b ${BOOTDIR}/isolinux.bin -c ${BOOTDIR}/boot.cat \
-boot-load-size 4 -boot-info-table ${efiargs} \ -boot-load-size 4 -boot-info-table -no-emul-boot \
-R -J -V '${product.name}' -T -graft-points \ ${efiargs} -R -J -V '${product.name}' -T -graft-points \
${BOOTDIR}=${outroot}/${BOOTDIR} \ ${BOOTDIR}=${outroot}/${BOOTDIR} \
images=${outroot}/images \ images=${outroot}/images \
${efigraft} ${efigraft}