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

diff --git a/initchroot.sh b/initchroot.sh
index 9d5f4a8..0bb249f 100755
--- a/initchroot.sh
+++ b/initchroot.sh
@@ -47,6 +47,16 @@ check_for_cmds debootstrap || exit 1
 debootstrap --arch i386 lenny ${ROOT_DIR} http://http.us.debian.org/debian
 mount -t proc proc ${ROOT_DIR}/proc
 mount -t devpts devpts ${ROOT_DIR}/dev/pts
+mkdir ${ROOT_DIR}/ofw
+
+# allow daemons to be installed without breaking
+mv ${ROOT_DIR}/sbin/start-stop-daemon ${ROOT_DIR}/sbin/start-stop-daemon.REAL
+cat >${ROOT_DIR}/sbin/start-stop-daemon<<EOF
+#!/bin/sh
+echo
+echo "Warning: Fake start-stop-daemon called, doing nothing"
+EOF
+chmod 755 ${ROOT_DIR}/sbin/start-stop-daemon
 
 # set up apt
 export DEBIAN_FRONTEND=noninteractive
@@ -64,16 +74,64 @@ EOF
 # set up base system
 echo "en_US.UTF-8 UTF-8" >${ROOT_DIR}/etc/locale.gen
 (chroot ${ROOT_DIR} aptitude install -y locales)
+
 k=$(wget -O- http://queued.mit.edu/~dilinger/builds-master/ | sed -ne 's/.*href="\(.\+\)_i386.deb".*/\1_i386.deb/p' | tail -n1)
 wget -O ${ROOT_DIR}/${k} http://queued.mit.edu/~dilinger/builds-master/${k}
 (chroot ${ROOT_DIR} dpkg -i /${k})
 rm -f ${ROOT_DIR}/${k}
 
+echo "debxo" > ${ROOT_DIR}/etc/hostname
+cat >${ROOT_DIR}/etc/hosts<<EOF
+127.0.0.1 localhost.localdomain localhost
+127.0.0.1 debxo
+
+# The following lines are desirable for IPv6 capable hosts
+::1     ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+ff02::3 ip6-allhosts
+EOF
+
 # install packages
 (chroot ${ROOT_DIR} aptitude install -y `cat package_list`)
 
+# configure X
+cat >${ROOT_DIR}/etc/X11/xorg.conf<<EOF
+# xorg.conf (X.Org X Window System server configuration file)
+
+Section "Monitor"
+	Identifier "Configured Monitor"
+	HorizSync 30-67
+	VertRefresh 48-52
+	DisplaySize 152 114
+	Mode "1200x900"
+		DotClock 57.275
+		HTimings 1200 1208 1216 1240
+		VTimings 900 905 908 912
+		Flags "-HSync" "-VSync"
+	EndMode
+EndSection
+
+Section "Screen"
+	Identifier "Default Screen"
+	Monitor "Configured Monitor"
+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} useradd -s /bin/bash ${DEFUSER})
+(chroot ${ROOT_DIR} passwd -l root)
+(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)
@@ -84,6 +142,9 @@ rm -f ${ROOT_DIR}/${k}
 echo "${DEFUSER} ALL=(ALL) ALL" >> ${ROOT_DIR}/etc/sudoers
 
 # done, clean up
+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