X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=initchroot.sh;h=0bb249f4f2c6af8d1eb9e831564e40df9c0dc9ca;hb=44ba7f60c073767f5ea7c12fe83fc8de6df5fc0d;hp=6140caeda2ff60acd1c2cd6ac6e40fefe870ace5;hpb=89c664d34d16422fcfdbf2ea0838b8a0a41b8b84;p=xodist

diff --git a/initchroot.sh b/initchroot.sh
index 6140cae..0bb249f 100755
--- a/initchroot.sh
+++ b/initchroot.sh
@@ -120,9 +120,18 @@ Section "Screen"
 EndSection
 EOF
 
+# configure gdm, gnome
+sed -i 's_\[daemon\]_\[daemon\]\n\nGreeter=/usr/lib/gdm/gdmlogin\n\nAutomaticLoginEnable=true\n\nAutomaticLogin=olpc_' ${ROOT_DIR}/etc/gdm/gdm.conf
+cat >${ROOT_DIR}/etc/gconf/2/local-defaults.path<<EOF
+# DebXO defaults (customized for the XO-1's display
+xml:readonly:/etc/gconf/debxo.xml.defaults
+EOF
+mkdir -p ${ROOT_DIR}/etc/gconf/debxo.xml.defaults
+cp %gconf-tree.xml ${ROOT_DIR}/etc/gconf/debxo.xml.defaults/
+
 # add default user
 (chroot ${ROOT_DIR} passwd -l root)
-(chroot ${ROOT_DIR} useradd -s /bin/bash ${DEFUSER})
+(chroot ${ROOT_DIR} useradd -s /bin/bash --create-home ${DEFUSER})
 (chroot ${ROOT_DIR} passwd -d ${DEFUSER})
 (chroot ${ROOT_DIR} adduser ${DEFUSER} cdrom)
 (chroot ${ROOT_DIR} adduser ${DEFUSER} audio)
@@ -137,3 +146,5 @@ mv ${ROOT_DIR}/sbin/start-stop-daemon.REAL ${ROOT_DIR}/sbin/start-stop-daemon
 (chroot ${ROOT_DIR} aptitude clean)
 umount ${ROOT_DIR}/proc
 umount ${ROOT_DIR}/dev/pts
+rm -rf ${ROOT_DIR}/home/*; 	# i have no idea what's adding this crap...
+rm -f ${ROOT_DIR}/var/cache/apt/*.bin