From 785d86d85dca756b446751c46fb867152c626c4b Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 24 Jan 2013 21:51:40 -0600
Subject: [PATCH] convert soas to split package and livecd bits

---
 fedora-livecd-soas.ks   | 61 +----------------------------------
 fedora-soas-packages.ks | 70 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 60 deletions(-)
 create mode 100644 fedora-soas-packages.ks

diff --git a/fedora-livecd-soas.ks b/fedora-livecd-soas.ks
index 9a185a7..cf87f55 100644
--- a/fedora-livecd-soas.ks
+++ b/fedora-livecd-soas.ks
@@ -11,69 +11,10 @@
 #%include fedora-live-mini.ks
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
+%include fedora-soas-packages.ks
 
 firewall --enabled --service=mdns,presence
 
-%packages
--@fonts
--@dial-up
--@multimedia
--@printing
--foomatic
--@gnome-desktop 
--yp-tools
--ypbind
--rdate
--rdist
--icedtea-web
--sendmail
--firefox
--glx-utils
--nmap-ncat
--PackageKit
--libfprint
--realmd
--eekboard-libs
-
-# == Core Sugar Platform ==
-@sugar-desktop
-
-# Write breaks unless we do this (we don't need it anyway)
-# enable for testing in the F17 dev cycle
-@input-methods
-
-# == Platform Components ==
-# from http://wiki.sugarlabs.org/go/0.94/Platform_Components
-alsa-plugins-pulseaudio
-alsa-utils
-gstreamer1-plugins-base
-gstreamer1-plugins-good
-gstreamer1-plugins-bad-free
-gstreamer-plugins-espeak
-pulseaudio
-pulseaudio-utils
-
-# explicitly remove openbox and hopefully deal with what firstboot wants
--openbox
-
-# remove deps that come from god knows where
--sane-backends
--sane-backends-drivers-scanners
-
-# Usefulness for DSL connections as per:
-# http://bugs.sugarlabs.org/ticket/1951
-rp-pppoe
-# Useful for SoaS duplication from:
-# http://bugs.sugarlabs.org/ticket/74
-livecd-tools
-
-# Get the Sugar boot screen
--plymouth-system-theme
--plymouth-theme-charge
-sugar-logos
-
-%end
-
 %post
 
 # Rebuild initrd for Sugar boot screen
diff --git a/fedora-soas-packages.ks b/fedora-soas-packages.ks
new file mode 100644
index 0000000..27c2cfd
--- /dev/null
+++ b/fedora-soas-packages.ks
@@ -0,0 +1,70 @@
+# fedora-livecd-soas.ks
+#
+# Description:
+# - A Sugar environment that you can carry in your pocket
+#
+# Maintainers:
+# - Peter Robinson <pbrobinson AT gmail DOT com>
+# - Sebastian Dziallas <sdz AT fedoraproject DOT org>
+# - Mel Chua <mchua AT fedoraproject DOT org>
+
+
+%packages
+-@fonts
+-@dial-up
+-@multimedia
+-@printing
+-foomatic
+-@gnome-desktop 
+-yp-tools
+-ypbind
+-rdate
+-rdist
+-icedtea-web
+-sendmail
+-firefox
+-glx-utils
+-nmap-ncat
+-PackageKit
+-libfprint
+-realmd
+-eekboard-libs
+
+# == Core Sugar Platform ==
+@sugar-desktop
+
+# Write breaks unless we do this (we don't need it anyway)
+# enable for testing in the F17 dev cycle
+@input-methods
+
+# == Platform Components ==
+# from http://wiki.sugarlabs.org/go/0.94/Platform_Components
+alsa-plugins-pulseaudio
+alsa-utils
+gstreamer1-plugins-base
+gstreamer1-plugins-good
+gstreamer1-plugins-bad-free
+gstreamer-plugins-espeak
+pulseaudio
+pulseaudio-utils
+
+# explicitly remove openbox and hopefully deal with what firstboot wants
+-openbox
+
+# remove deps that come from god knows where
+-sane-backends
+-sane-backends-drivers-scanners
+
+# Usefulness for DSL connections as per:
+# http://bugs.sugarlabs.org/ticket/1951
+rp-pppoe
+# Useful for SoaS duplication from:
+# http://bugs.sugarlabs.org/ticket/74
+livecd-tools
+
+# Get the Sugar boot screen
+-plymouth-system-theme
+-plymouth-theme-charge
+sugar-logos
+
+%end