Fix product name replacing in templates (#799919)
The product name may contain spaces, so it needs to be in quotes, otherwise the other words get stripped.
This commit is contained in:
parent
2e24ef2cc6
commit
4762c45b22
@ -26,7 +26,7 @@ ${make_efiboot("images/macboot.img", imgtype="apple")}
|
||||
copy ${KERNELDIR}/initrd.img ${EFIBOOTDIR}
|
||||
%endif
|
||||
install ${configdir}/grub.conf ${eficonf}
|
||||
replace @PRODUCT@ ${product.name} ${eficonf}
|
||||
replace @PRODUCT@ '${product.name}' ${eficonf}
|
||||
replace @VERSION@ ${product.version} ${eficonf}
|
||||
replace @KERNELPATH@ /${kdir}/vmlinuz ${eficonf}
|
||||
replace @INITRDPATH@ /${kdir}/initrd.img ${eficonf}
|
||||
|
@ -64,7 +64,7 @@ install ${configdir}/ofboot.b ${MACDIR}
|
||||
## install arch-specific bootloader config
|
||||
install ${configdir}/yaboot.conf.in ${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 @ROOT@ "${rootarg}" ${KERNELDIR}/yaboot.conf
|
||||
|
||||
|
@ -16,7 +16,7 @@ install ${configdir}/boot.msg ${BOOTDIR}
|
||||
|
||||
## configure bootloader
|
||||
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
|
||||
|
||||
## install kernels
|
||||
|
@ -24,7 +24,7 @@ install boot/memtest* ${BOOTDIR}/memtest
|
||||
|
||||
## configure bootloader
|
||||
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
|
||||
|
||||
## install kernels
|
||||
|
Loading…
Reference in New Issue
Block a user