[Fedora-livecd-list] [PATCH] Recognize rd.live.image as well as liveimg in sed scripts of livecd-iso-to-disk & edit-livecd

[Frederick Grose]

commit ee5d9b8b22039d83655bdb6235489995c87a7da9
Author: Frederick Grose <fgrose(a)sugarlabs.org&gt;
Date:   Tue Jul 31 22:48:49 2012 -0400

    Recognize rd.live.image as well as liveimg in sed scripts.

diff --git a/tools/edit-livecd b/tools/edit-livecd
index bb59c7f..1670228 100755
--- a/tools/edit-livecd
+++ b/tools/edit-livecd
@@ -423,7 +423,7 @@ class LiveImageEditor(LiveImageCreator):
             args.append('-e')
             args.append('s/rootfstype=[^ ]* [^ ]*/rootfstype=auto ro/')
             args.append('-e')
-            args.append('s/liveimg .* quiet/liveimg quiet/')
+            args.append('s/\(r*d*.*live.*ima*ge*\) .* quiet/\1 quiet/')
         args.append('-e')
         args.append('s/root=[^ ]*/root=live:CDLABEL=' + self.name + '/')
         if self.ks:
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 7df49c2..71fb288 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -1174,7 +1174,7 @@ if [ "$srctype" = "live" ]; then
     if [[ -d $SRCMNT/syslinux/ ]]; then
         echo "Preparing boot config file."
         sed -i -e "s/root=live:[^ ]*/root=live:CDLABEL=name/"\
-               -e "s/liveimg .* quiet/liveimg quiet/"\
+               -e "s/\(r*d*.*live.*ima*ge*\) .* quiet/\1 quiet/"\
                     $BOOTCONFIG $BOOTCONFIG_EFI
         sed -i -e "s/^timeout.*$/timeout\ 100/"\
                -e "/^totaltimeout.*$/d" $BOOTCONFIG
@@ -1192,7 +1192,8 @@ if [ -n "$kernelargs" ]; then
     fi
 fi
 if [ "$LIVEOS" != "LiveOS" ]; then
-    sed -i -e "s;liveimg;liveimg live_dir=$LIVEOS;" $BOOTCONFIG
$BOOTCONFIG_EFI
+    sed -i -e "s;r*d*.*live.*ima*ge*;& live_dir=$LIVEOS;"\
+              $BOOTCONFIG $BOOTCONFIG_EFI
 fi

 # EFI images are in $SYSLINUXPATH now
@@ -1234,7 +1235,8 @@ if [ "$overlaysizemb" -gt 0 ]; then
             dd if=/dev/null of=$TGTMNT/$LIVEOS/$OVERFILE count=1 bs=1M
seek=$overlaysizemb
         fi
     fi
-    sed -i -e "s/liveimg/liveimg overlay=${TGTLABEL}/" $BOOTCONFIG
$BOOTCONFIG_EFI
+    sed -i -e "s/r*d*.*live.*ima*ge*/& overlay=${TGTLABEL}/"\
+              $BOOTCONFIG $BOOTCONFIG_EFI
     sed -i -e "s/\ ro\ /\ rw\ /" $BOOTCONFIG  $BOOTCONFIG_EFI
 fi