From 24c18233aa0e1eb987afbbc3b60fdaeadf81f4e8 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Tue, 21 Aug 2012 16:26:58 -0700
Subject: [PATCH] livemedia-creator: use rd.live.image instead of liveimg

---
 docs/fedora-livemedia.ks                  | 4 ++--
 share/live/config_files/x86/grub.conf     | 4 ++--
 share/live/config_files/x86/grub2-efi.cfg | 4 ++--
 share/live/config_files/x86/isolinux.cfg  | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/fedora-livemedia.ks b/docs/fedora-livemedia.ks
index 5e81c4c0..2f841420 100644
--- a/docs/fedora-livemedia.ks
+++ b/docs/fedora-livemedia.ks
@@ -50,7 +50,7 @@ cat > /etc/rc.d/init.d/livesys << EOF
 
 . /etc/init.d/functions
 
-if ! strstr "\`cat /proc/cmdline\`" liveimg || [ "\$1" != "start" ]; then
+if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ]; then
     exit 0
 fi
 
@@ -238,7 +238,7 @@ cat > /etc/rc.d/init.d/livesys-late << EOF
 
 . /etc/init.d/functions
 
-if ! strstr "\`cat /proc/cmdline\`" liveimg || [ "\$1" != "start" ] || [ -e /.liveimg-late-configured ] ; then
+if ! strstr "\`cat /proc/cmdline\`" rd.live.image || [ "\$1" != "start" ] || [ -e /.liveimg-late-configured ] ; then
     exit 0
 fi
 
diff --git a/share/live/config_files/x86/grub.conf b/share/live/config_files/x86/grub.conf
index 3547540d..b7fdf822 100644
--- a/share/live/config_files/x86/grub.conf
+++ b/share/live/config_files/x86/grub.conf
@@ -5,9 +5,9 @@ timeout 5
 hiddenmenu
 title @PRODUCT@ @VERSION@
 	findiso
-	kernel @KERNELPATH@ @ROOT@ liveimg rd.luks=0 rd.md=0 rd.dm=0
+	kernel @KERNELPATH@ @ROOT@ rd.live.image rd.luks=0 rd.md=0 rd.dm=0
 	initrd @INITRDPATH@
 title Test this media & start @PRODUCT@
 	findiso
-	kernel @KERNELPATH@ @ROOT@ quiet liveimg rd.live.check rd.luks=0 rd.md=0 rd.dm=0
+	kernel @KERNELPATH@ @ROOT@ quiet rd.live.image rd.live.check rd.luks=0 rd.md=0 rd.dm=0
 	initrd @INITRDPATH@
diff --git a/share/live/config_files/x86/grub2-efi.cfg b/share/live/config_files/x86/grub2-efi.cfg
index f21d085b..6dea0aa2 100644
--- a/share/live/config_files/x86/grub2-efi.cfg
+++ b/share/live/config_files/x86/grub2-efi.cfg
@@ -21,11 +21,11 @@ search --no-floppy --set=root -l '@ISOLABEL@'
 
 ### BEGIN /etc/grub.d/10_linux ###
 menuentry '@PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os {
-	linuxefi @KERNELPATH@ @ROOT@
+	linuxefi @KERNELPATH@ @ROOT@ quiet rd.live.image rd.luks=0 rd.md=0 rd.dm=0
 	initrdefi @INITRDPATH@
 }
 menuentry 'Test this media & start @PRODUCT@' --class fedora --class gnu-linux --class gnu --class os {
-	linuxefi @KERNELPATH@ @ROOT@ quiet rd.live.check
+	linuxefi @KERNELPATH@ @ROOT@ quiet rd.live.image rd.live.check rd.luks=0 rd.md=0 rd.dm=0
 	initrdefi @INITRDPATH@
 }
 
diff --git a/share/live/config_files/x86/isolinux.cfg b/share/live/config_files/x86/isolinux.cfg
index e1588347..cb20bb4f 100644
--- a/share/live/config_files/x86/isolinux.cfg
+++ b/share/live/config_files/x86/isolinux.cfg
@@ -60,11 +60,11 @@ label linux
   menu label ^Start @PRODUCT@ (default)
   menu default
   kernel vmlinuz
-  append initrd=initrd.img @ROOT@ quiet liveimg rd.luks=0 rd.md=0 rd.dm=0
+  append initrd=initrd.img @ROOT@ quiet rd.live.image rd.luks=0 rd.md=0 rd.dm=0
 label check
   menu label Test this ^media & start @PRODUCT@
   kernel vmlinuz
-  append initrd=initrd.img @ROOT@ quiet liveimg rd.live.check rd.luks=0 rd.md=0 rd.dm=0
+  append initrd=initrd.img @ROOT@ quiet rd.live.image rd.live.check rd.luks=0 rd.md=0 rd.dm=0
 menu separator # insert an empty line
 # utilities submenu
 menu begin ^Troubleshooting
@@ -77,7 +77,7 @@ label vesa
 	@PRODUCT@.
   endtext
   kernel vmlinuz
-  append initrd=initrd.img @ROOT@ xdriver=vesa nomodeset quiet liveimg rd.luks=0 rd.md=0 rd.dm=0
+  append initrd=initrd.img @ROOT@ xdriver=vesa nomodeset quiet rd.live.image rd.luks=0 rd.md=0 rd.dm=0
 label memtest
   menu label Run a ^memory test
   text help