From 26ea847e8f7b1e8b6faf5d8257c55e5511efa9d8 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Thu, 13 Sep 2012 16:07:24 -0700
Subject: [PATCH] live uses root not inst.stage2

I changed too many templates when changing to inst.stage2, live still
obviously needs root= in order to boot.
---
 share/live/efi.tmpl   | 5 ++---
 share/live/sparc.tmpl | 2 +-
 share/live/x86.tmpl   | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/share/live/efi.tmpl b/share/live/efi.tmpl
index 36947f83..988b0957 100644
--- a/share/live/efi.tmpl
+++ b/share/live/efi.tmpl
@@ -40,10 +40,9 @@ ${make_efiboot("images/efiboot.img")}
     replace @SPLASHPATH@ /EFI/BOOT/splash.xpm.gz ${eficonf}
     replace @ISOLABEL@ '${isolabel}' ${eficonf}
     %if disk:
-        ## FIXME: using root= causes problems with product.img (see bug 811979)
-        replace @ROOT@ inst.stage2:LABEL=ANACONDA ${eficonf}
+        replace @ROOT@ root=live:LABEL=ANACONDA ${eficonf}
     %else:
-        replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${eficonf}
+        replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${eficonf}
     %endif
     %if efiarch == 'IA32':
         copy ${eficonf} ${EFIBOOTDIR}/BOOT.conf
diff --git a/share/live/sparc.tmpl b/share/live/sparc.tmpl
index 1a66e2c3..2452f80b 100644
--- a/share/live/sparc.tmpl
+++ b/share/live/sparc.tmpl
@@ -17,7 +17,7 @@ install ${configdir}/boot.msg ${BOOTDIR}
 ## configure bootloader
 replace @VERSION@ ${product.version} ${BOOTDIR}/boot.msg
 replace @PRODUCT@ '${product.name}' ${BOOTDIR}/boot.msg
-replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${BOOTDIR}/silo.conf
+replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${BOOTDIR}/silo.conf
 
 ## install kernels
 ## FIXME: this will overwrite if there are multiple sparc kernels
diff --git a/share/live/x86.tmpl b/share/live/x86.tmpl
index ac41d89e..8d31b8bc 100644
--- a/share/live/x86.tmpl
+++ b/share/live/x86.tmpl
@@ -25,7 +25,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 @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${BOOTDIR}/isolinux.cfg
+replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${BOOTDIR}/isolinux.cfg
 
 ## install kernels
 mkdir ${KERNELDIR}