switch to gdm, name user liveuser again, reduze img size

2 files changed, 23 insertions, 28 deletions

diff --git a/soas-base.ks b/soas-base.ks
index d63a201..ef152df 100644
--- a/soas-base.ks
+++ b/soas-base.ks
@@ -6,7 +6,7 @@ selinux --disabled
 firewall --disabled
 xconfig --startxonboot
 bootloader --timeout=1
-part / --size 2048
+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
 
 # We're on Rawhide now. Switch to F12 Alpha.
@@ -197,10 +197,10 @@ mountPersistentHome() {
   # and finally do the mount
   mount \$mountopts \$homedev /home
   # if we have /home under what's passed for persistent home, then
-  # we should make that the real /home.  useful for mtd device on olpc
+  # we should make that the real /home.  useful for mtd device on liveuser
   if [ -d /home/home ]; then mount --bind /home/home /home ; fi
   [ -x /sbin/restorecon ] && /sbin/restorecon /home
-  if [ -d /home/olpc ]; then USERADDARGS="-M" ; fi
+  if [ -d /home/liveuser ]; then USERADDARGS="-M" ; fi
 }
 
 findPersistentHome() {
@@ -235,10 +235,10 @@ if [ -n "\$configdone" ]; then
 fi
 
 # add soas user with no passwd
-/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 user
 echo "%wheel ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 
 # don't start yum-updatesd for livecd boots
@@ -383,7 +383,7 @@ Section "Screen"
 EndSection
 FOE
 
-echo "Xft.dpi: 150" > /home/olpc/.Xresources
+echo "Xft.dpi: 150" > /home/liveuser/.Xresources
 
 fi
 
diff --git a/soas-sugar.ks b/soas-sugar.ks
index e60a9d1..79292bb 100644
--- a/soas-sugar.ks
+++ b/soas-sugar.ks
@@ -24,8 +24,8 @@ pygame
 # additional packages
 DeviceKit-disks
 evince-djvu
+gdm
 gvfs
-olpc-utils
 vte
 
 # e-mail client
@@ -154,21 +154,9 @@ cd $WD
 # make sure to include date of compose
 echo `date -R` >> /etc/redhat-release
 
-# 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
-
 # setup e-mail for bug reports
 sed -i 's/root@localhost/feedback@sugarlabs.org/g' /etc/abrt/plugins/Mailx.conf
 
-cat > /etc/sysconfig/desktop <<EOF
-DISPLAYMANAGER=/usr/sbin/olpc-dm
-EOF
-
 cat >> /etc/rc.d/init.d/livesys << EOF
 
 # try to work-around issues with NM and APs
@@ -192,11 +180,11 @@ gpgcheck=0
 FOE
 
 # fix permissions on home directory
-chown olpc /home/olpc
-chgrp olpc /home/olpc
+chown liveuser /home/liveuser
+chgrp liveuser /home/liveuser
 
 # setup Xclients
-cat >> /home/olpc/.Xclients << FOE
+cat >> /home/liveuser/.Xclients << FOE
 xsetroot -def
 
 eval \\\$(dbus-launch --sh-syntax --exit-with-session)
@@ -211,8 +199,8 @@ fi
 SUGAR_SCALING=\\\$SUGAR_SCALING sugar
 FOE
 
-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
@@ -240,19 +228,19 @@ FOE
 
 # 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
 
 # check modules and themes and run firstboot
@@ -263,6 +251,13 @@ 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
+
 EOF
 
 %end