From fbc897710562312617a16a532d37ade126fd6ce1 Mon Sep 17 00:00:00 2001
From: Will Woods <wwoods@redhat.com>
Date: Thu, 30 Jun 2011 16:05:04 -0400
Subject: [PATCH] clarify isolinux.cfg twiddling stuff

---
 share/sparc.tmpl |  7 +++++++
 share/x86.tmpl   | 11 ++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/share/sparc.tmpl b/share/sparc.tmpl
index 53385868..66b7d84a 100644
--- a/share/sparc.tmpl
+++ b/share/sparc.tmpl
@@ -19,6 +19,13 @@ replace %PRODUCT% ${product.name} ${BOOTDIR}/boot.msg
     installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
 %endfor
 
+replace %ROOT% 'root=live:CDLABEL=PBOOT' ${BOOTDIR}/silo.conf
+## FIXME: silo.conf is missing %ROOT%. workaround with manual twiddling
+<% cdroot='root=live:CDLABEL=PBOOT' %>
+replace 'alias=install' 'alias=install\n\tappend=${cdroot}' ${BOOTDIR}/silo.conf
+replace 'append=text'   'append="text ${cdroot}"'           ${BOOTDIR}/silo.conf
+replace 'append=ks'     'append="ks ${cdroot}"'             ${BOOTDIR}/silo.conf
+
 runcmd mkisofs -R -J -T -G /${BOOTDIR}/isofs.b -B ... \
   -s /${BOOTDIR}/silo.conf -r -V "PBOOT" \
   -A "${product.name} ${product.version}" \
diff --git a/share/x86.tmpl b/share/x86.tmpl
index 4453e061..0f14a45e 100644
--- a/share/x86.tmpl
+++ b/share/x86.tmpl
@@ -19,6 +19,12 @@ install ${ANABOOTDIR}/grub.conf ${BOOTDIR}
 
 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 %ROOT% 'root=live:CDLABEL=${udev_escape(product.name)}' ${BOOTDIR}/isolinux.cfg ${BOOTDIR}/grub.conf
+## FIXME: no %ROOT% in isolinux.cfg. workaround with manual twiddling.
+replace "append initrd=initrd.img" \
+        "append initrd=initrd.img root=live:CDLABEL=${udev_escape(product.name)}" \
+        ${BOOTDIR}/isolinux.cfg
+
 
 replace "default linux" "default vesamenu.c32" ${BOOTDIR}/isolinux.cfg
 replace "prompt 1"      "#prompt 1"            ${BOOTDIR}/isolinux.cfg
@@ -60,11 +66,6 @@ hardlink ${KERNELDIR}/initrd.img ${BOOTDIR}
     <%include file="efi.tmpl" args="ANABOOTDIR=ANABOOTDIR, KERNELDIR=KERNELDIR, efiarch=efiarch"/>
 %endif
 
-## CDLABEL matches the -V argument to mkisofs
-replace "append initrd=initrd.img" \
-        "append initrd=initrd.img root=live:CDLABEL=${udev_escape(product.name)}" \
-        ${BOOTDIR}/isolinux.cfg
-
 runcmd mkisofs -o ${outroot}/images/boot.iso \
        -b ${BOOTDIR}/isolinux.bin -c ${BOOTDIR}/boot.cat \
        -boot-load-size 4 -boot-info-table -no-emul-boot \