From de50815e5e4ad5a333821c4c1a505b0509a33577 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Wed, 22 Aug 2012 16:59:03 -0700
Subject: [PATCH] use inst.stage2=hd:LABEL (#848641)

The iso is able to autodetect the device and find stage2, but when they
are written to USB via dd it needs to know where to find the install
media.
---
 share/efi.tmpl        | 6 ++----
 share/live/efi.tmpl   | 4 ++--
 share/live/sparc.tmpl | 2 +-
 share/live/x86.tmpl   | 2 +-
 share/sparc.tmpl      | 2 +-
 share/x86.tmpl        | 3 +--
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/share/efi.tmpl b/share/efi.tmpl
index ba9aff4b..e6ac76bb 100644
--- a/share/efi.tmpl
+++ b/share/efi.tmpl
@@ -40,11 +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@ root=live:LABEL=ANACONDA ${eficonf}
+        replace @ROOT@ inst.stage2=hd:LABEL=ANACONDA ${eficonf}
     %else:
-        ## anaconda can find CDROM devices automatically so no root= is needed
-        replace @ROOT@ '' ${eficonf}
+        replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${eficonf}
     %endif
     %if efiarch == 'IA32':
         copy ${eficonf} ${EFIBOOTDIR}/BOOT.conf
diff --git a/share/live/efi.tmpl b/share/live/efi.tmpl
index 1e2fa97b..36947f83 100644
--- a/share/live/efi.tmpl
+++ b/share/live/efi.tmpl
@@ -41,9 +41,9 @@ ${make_efiboot("images/efiboot.img")}
     replace @ISOLABEL@ '${isolabel}' ${eficonf}
     %if disk:
         ## FIXME: using root= causes problems with product.img (see bug 811979)
-        replace @ROOT@ root=live:LABEL=ANACONDA ${eficonf}
+        replace @ROOT@ inst.stage2:LABEL=ANACONDA ${eficonf}
     %else:
-        replace @ROOT@ 'root=live:CDLABEL=${isolabel|udev}' ${eficonf}
+        replace @ROOT@ 'inst.stage2=hd:LABEL=${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 2452f80b..1a66e2c3 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@ 'root=live:CDLABEL=${isolabel|udev}' ${BOOTDIR}/silo.conf
+replace @ROOT@ 'inst.stage2=hd:LABEL=${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 8d31b8bc..ac41d89e 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@ 'root=live:CDLABEL=${isolabel|udev}' ${BOOTDIR}/isolinux.cfg
+replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${BOOTDIR}/isolinux.cfg
 
 ## install kernels
 mkdir ${KERNELDIR}
diff --git a/share/sparc.tmpl b/share/sparc.tmpl
index 2452f80b..1a66e2c3 100644
--- a/share/sparc.tmpl
+++ b/share/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@ 'root=live:CDLABEL=${isolabel|udev}' ${BOOTDIR}/silo.conf
+replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${BOOTDIR}/silo.conf
 
 ## install kernels
 ## FIXME: this will overwrite if there are multiple sparc kernels
diff --git a/share/x86.tmpl b/share/x86.tmpl
index 9e074e54..ac41d89e 100644
--- a/share/x86.tmpl
+++ b/share/x86.tmpl
@@ -25,8 +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
-## anaconda will find the CDROM automatically
-replace @ROOT@ '' ${BOOTDIR}/isolinux.cfg
+replace @ROOT@ 'inst.stage2=hd:LABEL=${isolabel|udev}' ${BOOTDIR}/isolinux.cfg
 
 ## install kernels
 mkdir ${KERNELDIR}