merge lunge

diff --cc initchroot.sh
index 79a45094e57fc4c8528803f83de1ca8b1a6cb08b,cce9f0447bbd381e6713260cf7471814bbd2e1cb..565a18c5e0102102a9d066ba4c6630f6b48ba93e
--- 1/initchroot.sh
--- 2/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
  
- # (works around a kde session start problem)
 +# add local network interface
- 
- # added by xodist
 +cat <<EOF >> ${ROOT_DIR}/etc/network/interfaces
 +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)