[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [lorax] Fix product name replacing in templates (#799919)



Ack.

On 03/07/2012 11:28 AM, Martin Gracik wrote:
The product name may contain spaces, so it needs
to be in quotes, otherwise the other words get stripped.
---
  share/efi.tmpl   |    2 +-
  share/ppc.tmpl   |    2 +-
  share/sparc.tmpl |    2 +-
  share/x86.tmpl   |    2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/share/efi.tmpl b/share/efi.tmpl
index 7cd5850..771bb2c 100644
--- a/share/efi.tmpl
+++ b/share/efi.tmpl
@@ -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}
diff --git a/share/ppc.tmpl b/share/ppc.tmpl
index 7433afd..4879c45 100644
--- a/share/ppc.tmpl
+++ b/share/ppc.tmpl
@@ -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

diff --git a/share/sparc.tmpl b/share/sparc.tmpl
index cfdb04e..2452f80 100644
--- a/share/sparc.tmpl
+++ b/share/sparc.tmpl
@@ -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
diff --git a/share/x86.tmpl b/share/x86.tmpl
index 2dd74ad..ceeac8f 100644
--- a/share/x86.tmpl
+++ b/share/x86.tmpl
@@ -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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]