From aebb5de8e9024aa6b41faeb917064285afb73dcc Mon Sep 17 00:00:00 2001
From: Frederick Grose <fgrose@sugarlabs.org>
Date: Thu, 13 Sep 2018 21:52:12 -0400
Subject: [PATCH] fedora-soas: Include livecd-iso-to-disk in .iso filesystem.

Inject install code in lorax template live/x86.tmpl for livemedia-
  creator builds.
Also, remove wrong path for dracut;
give glib-compile-schemas the schemas directory;
update maintainers.
---
 fedora-live-soas.ks   |  2 --
 fedora-soas-common.ks | 14 ++++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/fedora-live-soas.ks b/fedora-live-soas.ks
index 19c4099..880a529 100644
--- a/fedora-live-soas.ks
+++ b/fedora-live-soas.ks
@@ -5,8 +5,6 @@
 #
 # Maintainers:
 # - Peter Robinson <pbrobinson AT gmail DOT com>
-# - Sebastian Dziallas <sdz AT fedoraproject DOT org>
-# - Mel Chua <mchua AT fedoraproject DOT org>
 
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
diff --git a/fedora-soas-common.ks b/fedora-soas-common.ks
index 9d16314..da27970 100644
--- a/fedora-soas-common.ks
+++ b/fedora-soas-common.ks
@@ -92,7 +92,7 @@ sugar-logos
 # Rebuild initrd for Sugar boot screen
 KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
 /usr/sbin/plymouth-set-default-theme sugar
-/sbin/dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
+dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
 
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
 rm -f /var/lib/rpm/__db*
@@ -163,6 +163,16 @@ show-logout=false
 [org.sugarlabs.power]
 automatic=true
 EOF
-/usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/sugar.soas.gschema.override
+/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