From: James Cameron <quozl@laptop.org>
Date: Sun, 26 Oct 2008 00:08:40 +0000 (+1100)
Subject: merge lunge
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08922b749b97fa4ae80b172780f546dbc4080fcf;p=xodist

merge lunge
---

08922b749b97fa4ae80b172780f546dbc4080fcf
diff --cc initchroot.sh
index 79a4509,cce9f04..565a18c
--- a/initchroot.sh
+++ b/initchroot.sh
@@@ -228,15 -232,16 +232,22 @@@ rm -rf ${ROOT_DIR}/home/*; 	# i have n
  (chroot ${ROOT_DIR} adduser ${DEFUSER} floppy)
  echo "${DEFUSER} ALL=(ALL) NOPASSWD: ALL" >> ${ROOT_DIR}/etc/sudoers
  
 +# add local network interface
- # (works around a kde session start problem)
 +cat <<EOF >> ${ROOT_DIR}/etc/network/interfaces
- 
- # added by xodist
 +auto lo
 +iface lo inet loopback
 +EOF
 +
+ # configure sugar
+ if [ -d ${ROOT_DIR}/usr/share/sugar ]; then
+     # #?
+     ln -sf /usr/share/activities/ ${ROOT_DIR}/usr/share/sugar
+     cat >> ${ROOT_DIR}/home/${DEFUSER}/.Xsession <<- EOF
+ matchbox-window-manager -use_titlebar no &
+ sugar
+ EOF
+ fi
+ 
  # done, clean up
  mv ${ROOT_DIR}/sbin/start-stop-daemon.REAL ${ROOT_DIR}/sbin/start-stop-daemon
  (chroot ${ROOT_DIR} aptitude clean)