get everything ready in time for the beta (major changes)

3 files changed, 24 insertions, 53 deletions

diff --git a/soas-appliance.ks b/soas-appliance.ks
index 9b505ec..544b7a1 100644
--- a/soas-appliance.ks
+++ b/soas-appliance.ks
@@ -8,7 +8,7 @@ xconfig --startxonboot
 
 bootloader --timeout=1 --append="acpi=force"
 network --bootproto=dhcp --device=eth0 --onboot=on
-services --enabled=abrt,network --disabled=acpid,avahi-daemon,auditd,cups,dnsmasq,exim, ip6tables,iptables,irda,kerneloops,mdmonitor,netfs,nfs,nfslock,nscd,portreserve,rpcbind,rpcgssd,rpcidmapd,sshd
+services --enabled=abrt,network --disabled=avahi-daemon,auditd,cups,dnsmasq,ip6tables,iptables,irda,mdmonitor,netfs,nfs,nfslock,nscd,portreserve,rpcbind,rpcgssd,rpcidmapd,sshd
 
 device virtio_blk
 device virtio_pci
@@ -49,8 +49,9 @@ pygame
 # additional packages
 DeviceKit-disks
 evince-djvu
+gdm
 gvfs
-olpc-utils
+python-decorator
 vte
 
 # e-mail client
@@ -68,10 +69,6 @@ system-config-keyboard
 # pull plymouth theme
 plymouth-theme-soas
 
-# enable automatic bug reporting
-abrt*
--kerneloops
-
 # sound
 pulseaudio
 alsa-plugins-pulseaudio
@@ -287,19 +284,19 @@ cat > /etc/rc.d/init.d/livesys << EOF
 
 # unzip activities and clean up
 cd /usr/share/sugar/bundles
-ACTIVITY_DIR=/home/olpc/Activities
+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 olpc -c "./install-activity.py \$file"
+    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 olpc -c ./copy-to-datastore.py
+su liveuser -c ./copy-to-datastore.py
 rm -f *.pdf
 
 EOF
@@ -316,30 +313,22 @@ chmod 755 /etc/rc.d/init.d/livesys
 chkconfig --level 345 firstboot off 2>/dev/null
 
 # create soas user
-/usr/sbin/useradd -m -c "soas user" -G audio,wheel olpc
-/usr/bin/passwd -d olpc
+/usr/sbin/useradd -m -c "SoaS user" -G audio,wheel liveuser
+/usr/bin/passwd -d liveuser
 
-# allow sudo for olpc user
+# allow sudo for liveuser
 echo "%wheel ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 
 # make sure to own home directory
-chown olpc /home/olpc
-chgrp olpc /home/olpc
-
-# setup olpc display manager and remove olpc-configure
-rm -f /etc/rc.d/init.d/diskspacecheck
-rm -f /etc/rc.d/init.d/diskspacerecover
-rm -f /etc/rc.d/init.d/olpc-configure
-rm -f /etc/X11/xorg-*.conf
-
-echo "/usr/sbin/olpc-dm" > /etc/X11/prefdm
-
-cat > /etc/sysconfig/desktop <<EOF
-DISPLAYMANAGER=/usr/sbin/olpc-dm
-EOF
-
-# setup e-mail for bug reports
-sed -i 's/root@localhost/feedback@sugarlabs.org/g' /etc/abrt/plugins/Mailx.conf
+chown liveuser /home/liveuser
+chgrp liveuser /home/liveuser
+
+# set up auto-login
+cat >> /etc/gdm/custom.conf << FOE
+[daemon]
+AutomaticLoginEnable=true
+AutomaticLogin=liveuser
+FOE
 
 # try to work-around issues with NM and APs
 rm -f /etc/NetworkManager/dispatcher.d/05-netfs
@@ -358,7 +347,7 @@ gpgcheck=0
 FOE
 
 # setup Xclients
-cat > /home/olpc/.Xclients <<FOE
+cat > /home/liveuser/.Xclients <<FOE
 
 eval \$(dbus-launch --sh-syntax --exit-with-session)
 
@@ -373,8 +362,8 @@ SUGAR_SCALING=\$SUGAR_SCALING sugar
 FOE
 
 # fix some permissions
-chmod a+x /home/olpc/.Xclients
-chown olpc:olpc /home/olpc/.Xclients
+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
diff --git a/soas-base.ks b/soas-base.ks
index ef152df..1e475c8 100644
--- a/soas-base.ks
+++ b/soas-base.ks
@@ -6,8 +6,8 @@ selinux --disabled
 firewall --disabled
 xconfig --startxonboot
 bootloader --timeout=1
-part / --size 1536
-services --enabled=abrt,NetworkManager --disabled=acpid,auditd,cups,dnsmasq,exim,ip6tables,iptables,irda,kerneloops,mdmonitor,netfs,network,nfs,nfslock,nscd,portreserve,rpcbind,rpcgssd,rpcidmapd,sshd
+part / --size 2048 --fstype ext4
+services --enabled=abrt,NetworkManager --disabled=auditd,cups,dnsmasq,ip6tables,iptables,irda,mdmonitor,netfs,network,nfs,nfslock,nscd,portreserve,rpcbind,rpcgssd,rpcidmapd,sshd
 
 # We're on Rawhide now. Switch to F12 Alpha.
 repo --name=rawhide --baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide-20090818/development/i386/os/ --excludepkgs=generic-release,generic-release-notes,kdebase-workspace,metacity,plymouth,plymouth-*,PolicyKit-kde
diff --git a/soas-sugar.ks b/soas-sugar.ks
index 79292bb..df8c05a 100644
--- a/soas-sugar.ks
+++ b/soas-sugar.ks
@@ -26,6 +26,7 @@ DeviceKit-disks
 evince-djvu
 gdm
 gvfs
+python-decorator
 vte
 
 # e-mail client
@@ -43,14 +44,6 @@ 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
@@ -154,9 +147,6 @@ cd $WD
 # make sure to include date of compose
 echo `date -R` >> /etc/redhat-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
@@ -243,14 +233,6 @@ 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]