From 3a1ac109c3eae20153468d2c3e72a45bffbddef6 Mon Sep 17 00:00:00 2001
From: Frederick Grose <fgrose@sugarlabs.org>
Date: Wed, 31 Oct 2018 02:02:27 -0400
Subject: [PATCH] fedora-live-base,fedora-soas: livecd-iso-to-disk in .iso
 filesystem.

For livemedia-creator builds, inject install code into the lorax
template live/x86.tmpl that copies the script livecd-iso-to-disk
into the .iso filesystem at /LiveOS when livecd-tools is present in
the install image.  This fixes commit 1fd9547, which failed in this.
---
 fedora-live-base.ks   | 15 +++++++++++++--
 fedora-soas-common.ks | 10 ----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 4fb8358..56b086b 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -342,8 +342,19 @@ cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
 
 # only works on x86, x86_64
 if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
-  if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
-  cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
+    # For livecd-creator builds
+    if [ ! -d $LIVE_ROOT/LiveOS ]; then mkdir -p $LIVE_ROOT/LiveOS ; fi
+    cp /usr/bin/livecd-iso-to-disk $LIVE_ROOT/LiveOS
+
+    # For lorax/livemedia-creator builds
+    sed -i '
+    /## make boot.iso/ i\
+    # Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\
+    <% f = "usr/bin/livecd-iso-to-disk" %>\
+    %if exists(f):\
+        install ${f} ${LIVEDIR}/${f|basename}\
+    %endif\
+    ' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl
 fi
 
 %end
diff --git a/fedora-soas-common.ks b/fedora-soas-common.ks
index da27970..07f535a 100644
--- a/fedora-soas-common.ks
+++ b/fedora-soas-common.ks
@@ -165,14 +165,4 @@ automatic=true
 EOF
 /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
 
-# For lorax/livemedia-creator builds.
-sed -i '
-/## make boot.iso/ i\
-# Add livecd-iso-to-disk script to .iso filesystem at /LiveOS/\
-<% f = "usr/bin/livecd-iso-to-disk" %>\
-%if exists(f):\
-    install ${f} ${LIVEDIR}/${f|basename}\
-%endif\
-' /usr/share/lorax/templates.d/99-generic/live/x86.tmpl
-
 %end