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

Fix product name replacing in templates (#799919)

Browse Source 
The product name may contain spaces, so it needs
to be in quotes, otherwise the other words get stripped.
This commit is contained in:
Martin Gracik 2012-03-07 11:27:11 +01:00 committed by Brian C. Lane
parent 2e24ef2cc6
commit 4762c45b22
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/efi.tmpl
View File

@ -26,7 +26,7 @@ ${make_efiboot("images/macboot.img", imgtype="apple")}
copy ${KERNELDIR}/initrd.img ${EFIBOOTDIR} copy ${KERNELDIR}/initrd.img ${EFIBOOTDIR}
%endif %endif
install ${configdir}/grub.conf ${eficonf} install ${configdir}/grub.conf ${eficonf}
replace @PRODUCT@ ${product.name} ${eficonf} replace @PRODUCT@ '${product.name}' ${eficonf}
replace @VERSION@ ${product.version} ${eficonf} replace @VERSION@ ${product.version} ${eficonf}
replace @KERNELPATH@ /${kdir}/vmlinuz ${eficonf} replace @KERNELPATH@ /${kdir}/vmlinuz ${eficonf}
replace @INITRDPATH@ /${kdir}/initrd.img ${eficonf} replace @INITRDPATH@ /${kdir}/initrd.img ${eficonf}

2
share/ppc.tmpl
View File

@ -64,7 +64,7 @@ install ${configdir}/ofboot.b ${MACDIR}
## install arch-specific bootloader config ## install arch-specific bootloader config
install ${configdir}/yaboot.conf.in ${KERNELDIR}/yaboot.conf install ${configdir}/yaboot.conf.in ${KERNELDIR}/yaboot.conf
replace @BITS@ ${bits} ${KERNELDIR}/yaboot.conf replace @BITS@ ${bits} ${KERNELDIR}/yaboot.conf
replace @PRODUCT@ ${product.name} ${KERNELDIR}/yaboot.conf replace @PRODUCT@ '${product.name}' ${KERNELDIR}/yaboot.conf
replace @VERSION@ ${product.version} ${KERNELDIR}/yaboot.conf replace @VERSION@ ${product.version} ${KERNELDIR}/yaboot.conf
replace @ROOT@ "${rootarg}" ${KERNELDIR}/yaboot.conf replace @ROOT@ "${rootarg}" ${KERNELDIR}/yaboot.conf

2
share/sparc.tmpl
View File

@ -16,7 +16,7 @@ install ${configdir}/boot.msg ${BOOTDIR}
## configure bootloader ## configure bootloader
replace @VERSION@ ${product.version} ${BOOTDIR}/boot.msg replace @VERSION@ ${product.version} ${BOOTDIR}/boot.msg
replace @PRODUCT@ ${product.name} ${BOOTDIR}/boot.msg replace @PRODUCT@ '${product.name}' ${BOOTDIR}/boot.msg
replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${BOOTDIR}/silo.conf replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${BOOTDIR}/silo.conf
## install kernels ## install kernels

2
share/x86.tmpl
View File

@ -24,7 +24,7 @@ install boot/memtest* ${BOOTDIR}/memtest
## configure bootloader ## configure bootloader
replace @VERSION@ ${product.version} ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg 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 @PRODUCT@ '${product.name}' ${BOOTDIR}/grub.conf ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/*.msg
replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${BOOTDIR}/isolinux.cfg replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${BOOTDIR}/isolinux.cfg
## install kernels ## install kernels