From 458bdbcdf6d76b92824c28fb9e382751e86301d1 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sat, 12 Nov 2011 10:22:59 +0000
Subject: [PATCH] SoaS: minor cleanups

---
 fedora-livecd-soas.ks | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/fedora-livecd-soas.ks b/fedora-livecd-soas.ks
index 5ca7cef..d4c1557 100644
--- a/fedora-livecd-soas.ks
+++ b/fedora-livecd-soas.ks
@@ -11,11 +11,15 @@
 %include fedora-live-mini.ks
 
 part / --size=2048
+firewall --enabled --service=mdns
 
 %packages
 
 # == 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
 
 # explicitly remove these as they're broken
 -sugar-read
@@ -25,7 +29,7 @@ part / --size=2048
 accountsservice
 
 # == Platform Components ==
-# from http://wiki.sugarlabs.org/go/0.88/Platform_Components
+# from http://wiki.sugarlabs.org/go/0.94/Platform_Components
 alsa-plugins-pulseaudio
 alsa-utils
 etoys
@@ -38,9 +42,6 @@ pygame
 pulseaudio
 pulseaudio-utils
 
-# Write breaks unless we do this (we don't need it anyway)
--@input-methods
-
 # explicitly remove openbox and add metacity to hopefully deal with what firstboot wants
 -openbox
 metacity
@@ -68,11 +69,6 @@ sugar-logos
 b43-openfwwf
 libertas-usb8388-firmware
 
-# == Fonts ==
-# More font support according to:
-# http://bugs.sugarlabs.org/ticket/1119
-# Moved to mini.ks
-
 %end
 
 %post
@@ -81,6 +77,7 @@ libertas-usb8388-firmware
 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
+
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
 rm -f /var/lib/rpm/__db*