diff options
Diffstat (limited to 'soas-sugar.ks')
| -rw-r--r-- | soas-sugar.ks | 227 |
1 files changed, 44 insertions, 183 deletions
diff --git a/soas-sugar.ks b/soas-sugar.ks index 79292bb..6aa4baa 100644 --- a/soas-sugar.ks +++ b/soas-sugar.ks @@ -1,4 +1,5 @@ %include soas-base.ks +%include soas-aslo-and-content.ks repo --name=sugar --baseurl=http://download.sugarlabs.org/soas/repositories/3/ @@ -15,22 +16,12 @@ csound-python espeak gnome-python2-evince libffi -libxml2-python +libxml2-python metacity numpy pyabiword pygame -# additional packages -DeviceKit-disks -evince-djvu -gdm -gvfs -vte - -# e-mail client -alpine - # multimedia implementations gnash-plugin @@ -40,136 +31,21 @@ plymouth-theme-soas # allow better power management gnome-power-manager -# additional wifi support -b43-openfwwf - # enable automatic bug reporting abrt* -kerneloops -# include first boot configuration -firstboot -smolt-firstboot - -# get ready for installer support -gparted -zyx-liveinstaller - -# sound -pulseaudio -alsa-plugins-pulseaudio -alsa-utils -gstreamer-plugins-good -gstreamer-plugins-espeak - -# fonts -google-droid-fonts-common -google-droid-sans-fonts -google-droid-sans-mono-fonts -google-droid-serif-fonts - -%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 4026" # Typing Turtle -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 4204" # Arithmetic - -WD=$PWD -BUNDLES_DIR=$INSTALL_ROOT/usr/share/sugar/bundles - -mkdir -p $BUNDLES_DIR -cd $BUNDLES_DIR - -for id in $ASLO ; do - wget http://activities.sugarlabs.org/en-US/sugar/downloads/latest/$id -done - -# get the script to install the activities -wget 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 - wget http://dev.sugarlabs.org/raw-attachment/ticket/840/$pdf -done - -# get sample content setup script directly from git -wget 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 -# make sure to include date of compose -echo `date -R` >> /etc/redhat-release +# make sure to include date of composition +echo `date -R` >> /etc/fedora-release # setup e-mail for bug reports sed -i 's/root@localhost/feedback@sugarlabs.org/g' /etc/abrt/plugins/Mailx.conf -cat >> /etc/rc.d/init.d/livesys << EOF - -# try to work-around issues with NM and APs -rm -f /etc/NetworkManager/dispatcher.d/05-netfs - -# fix issues with dbus and ck -rm -f /etc/X11/xinit/xinitrc.d/00-start-message-bus.sh - -# permanently set %__dbi_cdb rpm macro to work around jffs2's lack of writeable mmap() -mkdir -p /etc/rpm -echo "%__dbi_cdb create private nommap" > /etc/rpm/macros.rpmdb - -# add Sugar repository to yum +# add yum repos cat >> /etc/yum.repos.d/sugar.repo << FOE [sugar] name=Sugar @@ -179,29 +55,6 @@ enabled=1 gpgcheck=0 FOE -# fix permissions on home directory -chown liveuser /home/liveuser -chgrp liveuser /home/liveuser - -# setup Xclients -cat >> /home/liveuser/.Xclients << FOE -xsetroot -def - -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 - -chmod a+x /home/liveuser/.Xclients -chown liveuser:liveuser /home/liveuser/.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 @@ -226,38 +79,46 @@ vu.lux.olpc.Speak org.worldwideworkshop.olpc.JigsawPuzzle FOE -# unzip activities and clean up -cd /usr/share/sugar/bundles -ACTIVITY_DIR=/home/liveuser/Activities -mkdir -p \$ACTIVITY_DIR -chown -R 500:500 \$ACTIVITY_DIR - -chmod a+x install-activity.py -for file in *.xo; do - su liveuser -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 liveuser -c ./copy-to-datastore.py -rm -f *.pdf - -# check modules and themes and run firstboot -rm -f /usr/share/firstboot/modules/create_user.* -rm -f /usr/share/firstboot/modules/date.* -rm -f /usr/share/firstboot/modules/eula.* - -touch /etc/reconfigSys -chkconfig --level 345 firstboot on 2>/dev/null - -# set up auto-login -cat >> /etc/gdm/custom.conf << FOE -[daemon] -AutomaticLoginEnable=true -AutomaticLogin=liveuser -FOE +# invoke ntpdate when network comes up +ntpdate_file=/etc/NetworkManager/dispatcher.d/42-ntpdate +if [ ! -e $ntpdate_file ] ; then + cat > $ntpdate_file <<EOF +#!/bin/bash + +if [ "\$2" = "up" ] ; then + sleep 5 + /usr/sbin/ntpdate 0.pool.ntp.org >> /tmp/ntpdate.log 2>&1 +fi EOF +chmod u+rx $ntpdate_file +fi + + + +# invoke smolt a few seconds after network comes up +smolt_file=/etc/NetworkManager/dispatcher.d/43-smolt +if [ ! -e $smolt_file ] ; then + cat > $smolt_file <<EOF +#!/bin/bash + +export PATH=/bin:/usr/bin + +if [ "\$2" = "up" ] ; then + sleep 15 + ( nice /usr/bin/smoltSendProfile -a --submitOnly -b -c || /usr/sbin/smoltSendProfile -a --submitOnly -b ) >> /tmp/smolt.log 2>&1 +fi +EOF + +fi + +chmod u+rx $smolt_file + + + + %end + + +%include soas-liveuserscripts-eliminate.ks
\ No newline at end of file |