push olpc-dm to appliance and make it work

2 files changed, 26 insertions, 22 deletions

diff --git a/soas-appliance.ks b/soas-appliance.ks
index efb277f..226c243 100644
--- a/soas-appliance.ks
+++ b/soas-appliance.ks
@@ -50,11 +50,9 @@ pygame
 DeviceKit-disks
 evince-djvu
 gvfs
+olpc-utils
 vte
 
-# display manager
-slim
-
 # e-mail client
 alpine
 
@@ -281,19 +279,19 @@ cat > /etc/rc.d/init.d/livesys << EOF
 
 # unzip activities and clean up
 cd /usr/share/sugar/bundles
-ACTIVITY_DIR=/home/soas/Activities
+ACTIVITY_DIR=/home/olpc/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"
+    su olpc -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
+su olpc -c ./copy-to-datastore.py
 rm -f *.pdf
 
 EOF
@@ -307,24 +305,28 @@ 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" soas
-/usr/bin/passwd -d soas
+/usr/sbin/useradd -m -c "soas user" -G audio,wheel olpc
+/usr/bin/passwd -d olpc
+
+# allow sudo for olpc user
+echo "%wheel ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 
 # make sure to own home directory
-chown soas /home/soas
-chgrp soas /home/soas
+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
 
-# make sure to use slim
 cat > /etc/sysconfig/desktop <<EOF
-DISPLAYMANAGER=/usr/bin/slim-dynwm
+DISPLAYMANAGER=/usr/sbin/olpc-dm
 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
 
@@ -342,7 +344,7 @@ gpgcheck=0
 FOE
 
 # setup Xclients
-cat > /home/soas/.Xclients <<FOE
+cat > /home/olpc/.Xclients <<FOE
 
 eval \$(dbus-launch --sh-syntax --exit-with-session)
 
@@ -357,8 +359,8 @@ SUGAR_SCALING=\$SUGAR_SCALING sugar
 FOE
 
 # fix some permissions
-chmod a+x /home/soas/.Xclients
-chown soas:soas /home/soas/.Xclients
+chmod a+x /home/olpc/.Xclients
+chown olpc:olpc /home/olpc/.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-sugar.ks b/soas-sugar.ks
index ee0ec00..965831f 100644
--- a/soas-sugar.ks
+++ b/soas-sugar.ks
@@ -141,12 +141,14 @@ cd $WD
 
 %post
 
-# make sure to remove olpc-configure
+# 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