major change: rework appliance kickstart file

1 files changed, 128 insertions, 79 deletions

diff --git a/soas-appliance.ks b/soas-appliance.ks
index e2bd08d..65fbe08 100644
--- a/soas-appliance.ks
+++ b/soas-appliance.ks
@@ -3,7 +3,7 @@ keyboard us
 timezone US/Eastern
 auth --useshadow --enablemd5
 selinux --disabled
-firewall --enabled --service=mdns
+firewall --disabled
 xconfig --startxonboot
 
 bootloader --timeout=1 --append="acpi=force"
@@ -16,7 +16,7 @@ device scsi_wait_scan
 
 part / --size 1536 --fstype ext3 --ondisk sda
 
-repo --name=sugar --baseurl=http://download.sugarlabs.org/soas/repositories/2/
+repo --name=sugar --baseurl=http://download.sugarlabs.org/soas/repositories/3/
 
 # Fedora 11 is out now!
 repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-11&arch=i386 --excludepkgs=abiword,libabiword,generic-release,generic-release-notes,plymouth,plymouth-*,PolicyKit-kde
@@ -31,18 +31,7 @@ repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?rep
 kernel
 
 # sugar!
-# temporary changes until comps group gets fixed
 sugar
-sugar-browse
-sugar-calculator
-sugar-chat
-sugar-imageviewer
-sugar-jukebox
-sugar-log
-sugar-read
-sugar-terminal
-sugar-turtleart
-sugar-write
 
 # additional packages
 DeviceKit-disks
@@ -58,8 +47,8 @@ pygame
 python-json
 squeak-vm
 
-# use gdm to get login working
-gdm
+# try using slim as display manager again
+slim
 
 # e-mail client
 alpine
@@ -198,9 +187,122 @@ generic-release-notes
 
 # make sure debuginfo doesn't end up on the live image
 -*debuginfo
+
+%end
+
+%post --nochroot
+
+# Fructose Collection
+ASLO="$ASLO 4024" # Browse
+ASLO="$ASLO 4027" # Turtle Art
+ASLO="$ASLO 4028" # Read
+ASLO="$ASLO 4032" # Imageviewer
+ASLO="$ASLO 4041" # Pippy
+ASLO="$ASLO 4043" # Terminal
+ASLO="$ASLO 4045" # Jukebox
+ASLO="$ASLO 4056" # Log
+ASLO="$ASLO 4069" # Chat
+ASLO="$ASLO 4076" # Calculator
+ASLO="$ASLO 4201" # Write
+
+# Honey Selection
+ASLO="$ASLO 4029" # IRC
+ASLO="$ASLO 4034" # Moon
+ASLO="$ASLO 4035" # Read ETexts 
+ASLO="$ASLO 4037" # CartoonBuilder
+ASLO="$ASLO 4038" # Speak
+ASLO="$ASLO 4039" # ViewSlides
+ASLO="$ASLO 4041" # Pippy
+ASLO="$ASLO 4042" # InfoSlicer
+ASLO="$ASLO 4044" # FlipSticks
+ASLO="$ASLO 4046" # JigsawPuzzle
+ASLO="$ASLO 4047" # SliderPuzzle
+ASLO="$ASLO 4050" # Colors
+ASLO="$ASLO 4054" # FreeCell
+ASLO="$ASLO 4063" # Memorize
+ASLO="$ASLO 4064" # JokeMachine
+ASLO="$ASLO 4073" # StoryBuilder
+ASLO="$ASLO 4074" # Poll
+ASLO="$ASLO 4078" # Labyrinth
+ASLO="$ASLO 4081" # Record
+ASLO="$ASLO 4082" # Paint
+ASLO="$ASLO 4089" # Library
+ASLO="$ASLO 4191" # Clock
+ASLO="$ASLO 4193" # Physics
+ASLO="$ASLO 4194" # Get Internet Archive Books
+ASLO="$ASLO 4203" # Update
+
+WD=$PWD
+BUNDLES_DIR=$INSTALL_ROOT/usr/share/sugar/bundles
+
+mkdir -p $BUNDLES_DIR
+cd $BUNDLES_DIR
+
+for id in $ASLO ; do
+  curl -L http://activities.sugarlabs.org/en-US/sugar/downloads/latest/$id > $id.xo
+done
+
+# get the script to install the activities
+curl -O http://git.sugarlabs.org/projects/soas/repos/mainline/blobs/raw/2d1057e6d8e74aecfa82c0b8e51a2c8d772a7923/install-activity.py
+
+# pull sample content for the journal
+PDFS="$PDFS south_america.pdf"
+PDFS="$PDFS africa.pdf"
+PDFS="$PDFS asia.pdf"
+PDFS="$PDFS central_america.pdf"
+PDFS="$PDFS europe.pdf"
+PDFS="$PDFS middle_east.pdf"
+PDFS="$PDFS north_america.pdf"
+PDFS="$PDFS oceania.pdf"
+PDFS="$PDFS southeast_asia.pdf"
+
+for pdf in $PDFS ; do
+  curl -O http://dev.sugarlabs.org/raw-attachment/ticket/840/$pdf
+done
+
+# get sample content setup script directly from git
+curl -O http://git.sugarlabs.org/projects/soas/repos/mainline/blobs/raw/8ad00566985860f9891aea714c74e5430e9c395d/copy-to-datastore.py
+
+chown -R 500:500 $BUNDLES_DIR
+cd $WD
+
 %end
 
 %post
+cat > /etc/rc.d/init.d/livesys << EOF
+#!/bin/bash
+#
+# live: Init script for live image
+#
+# chkconfig: 345 00 99
+# description: Init script for live image.
+
+# unzip activities and clean up
+cd /usr/share/sugar/bundles
+ACTIVITY_DIR=/home/soas/Activities
+mkdir -p \$ACTIVITY_DIR
+chown -R 500:500 \$ACTIVITY_DIR
+
+chmod a+x install-activity.py
+for file in *.xo; do
+    su soas -c "./install-activity.py \$file"
+    rm -f \$file
+done
+
+# execute sample content script and clean up afterwards
+chmod a+x copy-to-datastore.py
+su soas -c ./copy-to-datastore.py
+rm -f *.pdf
+
+EOF
+
+# enable script to install stuff at boot time
+chmod 755 /etc/rc.d/init.d/livesys
+/sbin/restorecon /etc/rc.d/init.d/livesys
+/sbin/chkconfig --add livesys
+
+# turn off firstboot service
+chkconfig --level 345 firstboot off 2>/dev/null
 
 # create soas user
 /usr/sbin/useradd -m -c "soas user" soas
@@ -210,8 +312,16 @@ generic-release-notes
 chown soas /home/soas
 chgrp soas /home/soas
 
-# turn off firstboot service
-chkconfig --level 345 firstboot off 2>/dev/null
+# make sure to use slim
+cat > /etc/sysconfig/desktop <<EOF
+DISPLAYMANAGER=/usr/bin/slim-dynwm
+EOF
+
+# setup auto-login for slim
+cat >> /etc/slim.conf << FOE
+auto_login	yes
+default_user	soas
+FOE
 
 # try to work-around issues with NM and APs
 rm -f /etc/NetworkManager/dispatcher.d/05-netfs
@@ -224,19 +334,11 @@ cat >> /etc/yum.repos.d/sugar.repo << FOE
 [sugar]
 name=Sugar
 failovermethod=priority
-baseurl=http://download.sugarlabs.org/soas/repositories/2/
+baseurl=http://download.sugarlabs.org/soas/repositories/3/
 enabled=1
 gpgcheck=0
 FOE
 
-# 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
 
@@ -259,14 +361,6 @@ 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/bundles
-for bundle in \`find /usr/share/sugar/bundles -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
@@ -288,49 +382,4 @@ vu.lux.olpc.Speak
 org.worldwideworkshop.olpc.JigsawPuzzle
 FOE
 
-EOF
-
-%end
-
-%post --nochroot
-
-ASLO="$ASLO 4042" # InfoSlicer
-ASLO="$ASLO 4034" # Moon
-ASLO="$ASLO 4046" # JigsawPuzzle
-ASLO="$ASLO 4047" # SliderPuzzle
-ASLO="$ASLO 4063" # Memorize
-ASLO="$ASLO 4038" # Speak
-ASLO="$ASLO 4037" # CartoonBuilder
-ASLO="$ASLO 4044" # FlipSticks
-ASLO="$ASLO 4064" # JokeMachine
-ASLO="$ASLO 4029" # IRC
-ASLO="$ASLO 4054" # FreeCell
-ASLO="$ASLO 4039" # ViewSlides
-ASLO="$ASLO 4073" # StoryBuilder
-ASLO="$ASLO 4074" # Poll
-ASLO="$ASLO 4078" # Labyrinth
-ASLO="$ASLO 4082" # Paint
-ASLO="$ASLO 4081" # Record
-ASLO="$ASLO 4050" # Colors
-ASLO="$ASLO 4089" # Library
-ASLO="$ASLO 4041" # Pippy
-ASLO="$ASLO 4193" # Physics
-
-WD=$PWD
-BUNDLES_DIR=$INSTALL_ROOT/usr/share/sugar/bundles
-
-mkdir -p $BUNDLES_DIR
-cd $BUNDLES_DIR
-
-for id in $ASLO ; do
-  curl -L http://activities.sugarlabs.org/en-US/sugar/downloads/latest/$id > $id.xo
-done
-
-for file in *.xo ; do
-    unzip $file
-    rm $file
-done
-
-cd $WD
-
 %end