From ff0315f0178d44b372ab4c6732afd5f7803a4642 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sun, 12 Jun 2011 18:41:33 +0100
Subject: [PATCH] SoaS: merge fixes from branch

---
 fedora-live-mini.ks   | 5 ++---
 fedora-livecd-soas.ks | 5 +++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/fedora-live-mini.ks b/fedora-live-mini.ks
index 1878cf9..1745000 100644
--- a/fedora-live-mini.ks
+++ b/fedora-live-mini.ks
@@ -10,7 +10,7 @@ selinux --permissive
 firewall --enabled --service=mdns
 xconfig --startxonboot
 part / --size 4096 --fstype ext4
-services --enabled=NetworkManager,messagebus --disabled=network,sshd,iscsi,iscsid,lldpad
+services --enabled=NetworkManager,messagebus,avahi-daemon --disabled=network,sshd,iscsi,iscsid,lldpad
 
 repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
 #repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
@@ -392,8 +392,7 @@ rm -f /core*
 
 %end
 
-
-%post
+%post --nochroot
 cp $INSTALL_ROOT/usr/share/doc/*-release-*/GPL $LIVE_ROOT/GPL
 
 # only works on x86, x86_64
diff --git a/fedora-livecd-soas.ks b/fedora-livecd-soas.ks
index 5ec0104..71ce000 100644
--- a/fedora-livecd-soas.ks
+++ b/fedora-livecd-soas.ks
@@ -16,6 +16,10 @@ part / --size=2048
 
 # == Core Sugar Platform ==
 @sugar-desktop
+sugar-clock
+
+# temp work around due to working networking in Sugar. GRR NetworkManager!
+NetworkManager-gnome
 
 # explicitly remove these as they're broken
 -sugar-read
@@ -153,6 +157,7 @@ org.laptop.TurtleArtActivity
 org.sugarlabs.AbacusActivity
 org.sugarlabs.IRC
 org.vpri.EtoysActivity
+tv.alterna.Clock
 vu.lux.olpc.Speak
 FOE