major updates to appliance kickstart file

1 files changed, 58 insertions, 10 deletions

diff --git a/appliance.ks b/appliance.ks
index afdddf3..9c8b3db 100644
--- a/appliance.ks
+++ b/appliance.ks
@@ -24,9 +24,6 @@ repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?rep
 # use if mirrors are outdated
 # repo --name=rawhide --baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/i386/os/ --excludepkgs=abiword,libabiword,generic-logos,plymouth,plymouth-*,PolicyKit-kde
 
-# use static rawhide repo for now (equivalent to beta)
-# repo --name=rawhide --baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide-20090327/development/i386/os/ --excludepkgs=abiword,libabiword,generic-logos,plymouth,plymouth-*,PolicyKit-kde
-
 %packages --excludedocs --instLangs en_US
 
 # basic package set
@@ -43,12 +40,15 @@ DeviceKit-disks
 espeak
 etoys
 evince-djvu
+gtksourceview2
 gvfs
+libffi
 numpy
 olpcsound
 pygame
 python-json
 squeak-vm
+sugar-update-control
 
 # use gdm to get login working
 gdm
@@ -173,8 +173,7 @@ gstreamer-plugins-espeak
 -smolt*
 -*-backgrounds
 -compiz-gnome
--nautilus-cd-burner
--PackageKit*
+-nautilus-cd-burner-PackageKit*
 
 # strip fedora trademarks
 -fedora-logos
@@ -185,6 +184,18 @@ generic-logos
 %end
 
 %post
+
+# create soas user
+/usr/sbin/useradd -m -c "soas user" soas
+/usr/bin/passwd -d soas
+
+# make sure to own home directory
+chown soas /home/soas
+chgrp soas /home/soas
+
+# turn off firstboot service
+chkconfig --level 345 firstboot off 2>/dev/null
+
 # try to work-around issues with NM and APs
 rm -f /etc/NetworkManager/dispatcher.d/05-netfs
 
@@ -192,7 +203,7 @@ rm -f /etc/NetworkManager/dispatcher.d/05-netfs
 rm /etc/X11/xinit/xinitrc.d/00-start-message-bus.sh
 
 # Needed for spin debranding
-sed -i -e 's/Fedora/Generic/g' /etc/fedora-release
+sed -i -e 's/Fedora/SoaS/g' /etc/fedora-release
 
 # add Sugar repository to yum
 cat >> /etc/yum.repos.d/sugar.repo << FOE
@@ -204,14 +215,44 @@ enabled=1
 gpgcheck=0
 FOE
 
-# set login manager
-cat > /etc/sysconfig/desktop <<EOF
-DISPLAYMANAGER=/usr/bin/slim-dynwm
-EOF
+# set up timed gdm auto-login for after 60 seconds
+cat >> /etc/gdm/custom.conf << FOE
+[daemon]
+TimedLoginEnable=true
+TimedLogin=soas
+TimedLoginDelay=60
+FOE
+
+# setup Xclients
+cat > /home/soas/.Xclients <<FOE
+
+eval \$(dbus-launch --sh-syntax --exit-with-session)
+
+RESOLUTION=\$(xdpyinfo | grep resolution | sed "s/.* \\([0-9][0-9]*\\)x.*/\\1/")
+if [ "\$RESOLUTION" -gt 150 ]; then
+    SUGAR_SCALING=100
+else
+    SUGAR_SCALING=72
+fi
+
+SUGAR_SCALING=\$SUGAR_SCALING sugar
+FOE
+
+# fix some permissions
+chmod a+x /home/soas/.Xclients
+chown soas:soas /home/soas/.Xclients
 
 # disable the logout menu item in Sugar
 gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/show_logout false >/dev/null
 
+# setup activity directory
+mkdir -p /home/soas/Activities
+chown soas:soas /home/soas/Activities
+chown -R soas:soas /usr/share/sugar/honey
+for bundle in \`find /usr/share/sugar/honey -maxdepth 1\` ; do
+ln -s \$bundle /home/soas/Activities
+done
+
 # add more activities to the favorites
 cat > /usr/share/sugar/data/activities.defaults << FOE
 com.garycmartin.Moon
@@ -249,6 +290,13 @@ ASLO="$ASLO 4039" # ViewSlides
 ASLO="$ASLO 4073" # StoryBuilder
 ASLO="$ASLO 4074" # Poll
 ASLO="$ASLO 4058" # Develop
+ASLO="$ASLO 4078" # Labyrinth
+ASLO="$ASLO 4082" # Paint
+ASLO="$ASLO 4081" # Record
+ASLO="$ASLO 4059" # TamTamEdit
+ASLO="$ASLO 4060" # TamTamJam
+ASLO="$ASLO 4061" # TamTamMini
+ASLO="$ASLO 4062" # TamTamSynth Lab
 
 WD=$PWD
 BUNDLES_DIR=$INSTALL_ROOT/usr/share/sugar/honey