[spin-kickstarts] SoaS: some general cleanups and updates

[Peter Robinson]

commit 7e1713b954c6c236851438a6d5b1b8c5be0cf763
Author: Peter Robinson <pbrobinson(a)gmail.com&gt;
Date:   Mon Sep 12 10:37:18 2011 +0100

    SoaS: some general cleanups and updates

 fedora-live-mini.ks   |    2 --
 fedora-livecd-soas.ks |    7 ++-----
 2 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/fedora-live-mini.ks b/fedora-live-mini.ks
index af68f4b..c5da74f 100644
--- a/fedora-live-mini.ks
+++ b/fedora-live-mini.ks
@@ -120,8 +120,6 @@ avahi
 
 # Remove sendmail: this needs to be explicit
 -sendmail
-# But hopefully there shouldn't be deps so this shouldn't need to be there
-#ssmtp
 
 %end
 
diff --git a/fedora-livecd-soas.ks b/fedora-livecd-soas.ks
index 6ca08db..d553aba 100644
--- a/fedora-livecd-soas.ks
+++ b/fedora-livecd-soas.ks
@@ -16,10 +16,6 @@ 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
@@ -90,7 +86,7 @@ rm -f /var/lib/rpm/__db*
 
 # Get proper release naming in the control panel
 cat >> /boot/olpc_build << EOF
-Sugar on a Stick 6
+Sugar on a Stick 6 (Pineapple)
 Fedora release 16 (Verne)
 EOF
 
@@ -146,6 +142,7 @@ cat > /usr/share/sugar/data/activities.defaults << FOE
 org.laptop.AbiWordActivity
 org.laptop.Chat
 org.laptop.Calculate
+org.laptop.Clock
 org.laptop.Log
 org.laptop.Memorize
 org.laptop.physics