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

diff --git a/initchroot.sh b/initchroot.sh
index 9d5f4a8..0f6e1b9 100755
--- a/initchroot.sh
+++ b/initchroot.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
 #
 # Copyright © 2008  Andres Salomon <dilinger@queued.net>
 #
@@ -16,64 +16,198 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-DIST=lenny
 DEFUSER=olpc
+PLIST=gnome.packages
+APT_SOURCES="deb http://http.us.debian.org/debian/ lenny main contrib non-free
+deb http://security.debian.org/ lenny/updates main contrib non-free"
+LOCAL_APT_MIRROR=
 
-. functions.sh
+. ./functions.sh
 
 usage()
 {
 	echo "" 1>&2
-	echo "Usage: $0 <root directory>" 1>&2
+	echo "Usage: $0 [<options>] <root directory>" 1>&2
+	echo "" 1>&2
+	echo "Options:" 1>&2
+	echo "  --user <user>             Username for default user" 1>&2
+	echo "  --package-list <list>     File containing package list" 1>&2
+	echo "  --apt-sources <srcs>      Contents of /etc/apt/sources.list" 1>&2
+	echo "  --local-apt-mirror <srcs> sources.list for local mirror" 1>&2
 	echo "" 1>&2
 	exit 1
 }
 
-if [ "$#" != "1" ]; then
+while test $# != 0
+do
+	case $1 in
+	--user)
+		DEFUSER=$2
+		shift
+		;;
+	--package-list)
+		PLIST=$2
+		[ -f ${PLIST} ] || {
+			echo "Error: can't find file '${PLIST}'!" 1>&2
+			exit 2
+		}
+		shift
+		;;
+	--apt-sources)
+		APT_SOURCES="$2"
+		shift
+		;;
+	--local-apt-mirror)
+		LOCAL_APT_MIRROR="$2"
+		shift
+		;;
+	*)
+		if [ "$#" != "1" ]; then
+			echo "Unknown option $1" 1>&2
+			usage
+		else
+			ROOT_DIR="$1"
+		fi
+		;;
+	esac
+	shift
+done
+
+if [ "$ROOT_DIR" = "" ]; then
+	echo "" 1>&2
+	echo "*** No root directory specified!" 1>&2
 	usage
 fi
 
-ROOT_DIR=$1
-
 if [ -d "${ROOT_DIR}" ]; then
 	echo "" 1>&2
 	echo "*** ${ROOT_DIR} already exists!" 1>&2
 	usage
 fi
 
+start_logging $ROOT_DIR
+
 check_for_cmds debootstrap || exit 1
 
+if [ -z "${LOCAL_APT_MIRROR}" ]; then
+    LOCAL_APT_MIRROR="${APT_SOURCES}"
+fi
+
+# parse apt mirror
+MIRROR=$(printf "${LOCAL_APT_MIRROR}\n" | awk '/deb /{print $2}' | head -n1)
+DIST=$(printf "${LOCAL_APT_MIRROR}\n" | awk '/deb /{print $3}' | head -n1)
+
 # create chroot
-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
+debootstrap --arch i386 ${DIST} ${ROOT_DIR} ${MIRROR}
+mkdir ${ROOT_DIR}/ofw
+mkdir ${ROOT_DIR}/var/cache/apt/cache
+chroot_internal_mounts ${ROOT_DIR}
+
+# 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 hostname stuff
+echo "debxo" > ${ROOT_DIR}/etc/hostname
+cat >${ROOT_DIR}/etc/hosts<<EOF
+127.0.0.1 localhost.localdomain localhost
+127.0.0.1 debxo
 
-# set up apt
+# 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
+
+# set up apt (working around #314334)
 export DEBIAN_FRONTEND=noninteractive
 export DEBCONF_PRIORITY=critical
 cat >${ROOT_DIR}/etc/apt/apt.conf<<EOF
 Acquire::Pdiffs "false";
 APT::Install-Recommends "false";
+Dir {
+	Cache "var/cache/apt/" {
+		srcpkgcache "cache/srcpkgcache.bin";
+		pkgcache "cache/pkgcache.bin";
+	};
+};
 EOF
-cat >${ROOT_DIR}/etc/apt/sources.list<<EOF
-deb http://http.us.debian.org/debian ${DIST} main contrib non-free
-deb http://security.debian.org/ ${DIST}/updates main contrib non-free
-EOF
+printf "${LOCAL_APT_MIRROR}\n" >${ROOT_DIR}/etc/apt/sources.list
 (chroot ${ROOT_DIR} aptitude update)
 
-# set up base system
+# set up base system and base packages
 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}
+(chroot ${ROOT_DIR} aptitude install -y `cat base.packages`)
+
+k="http://lunge.mit.edu/~dilinger/debxo-0.2/initramfs-tools_0.92l.2_all.deb 
+ http://lunge.mit.edu/~dilinger/debxo-0.2/ofw-config_0.1_all.deb 
+ http://lunge.mit.edu/~dilinger/debxo-0.4/linux-2.6.25.15_2.6.25.15-165_i386.deb 
+ http://lunge.mit.edu/~dilinger/debxo-0.5/xserver-xorg-video-geode_2.11.0-0.3_i386.deb"
+mkdir -p cache
+for i in $k; do
+	pkg=$(basename ${i})
+	wget --continue -O cache/${pkg} ${i}
+	cp cache/${pkg} ${ROOT_DIR}/${pkg} 
+	(chroot ${ROOT_DIR} dpkg -i /${pkg})
+	pkgbase=$(echo $pkg | cut -d_ -f1)
+	echo $pkgbase hold | (chroot ${ROOT_DIR} dpkg --set-selections)
+	rm -f ${ROOT_DIR}/${pkg}
+done
+# take the geode driver off hold
+echo xserver-xorg-video-geode install | (chroot ${ROOT_DIR} dpkg --set-selections)
+
+# ensure certain modules get loaded during boot
+cat >>${ROOT_DIR}/etc/modules<<EOF
+lxfb
+fbcon
+olpc_dcon
+scx200_acb
+i8042
+olpc_battery
+msr
+EOF
 
 # install packages
-(chroot ${ROOT_DIR} aptitude install -y `cat package_list`)
+(chroot ${ROOT_DIR} aptitude install -y `grep --invert-match '^#' ${PLIST}`)
+
+# no longer a need for xorg.conf
+rm -f ${ROOT_DIR}/etc/X11/xorg.conf
+
+# key bindings/mappings
+if [ -d ${ROOT_DIR}/usr/share/hal/fdi/information/10freedesktop/ ]; then
+    cp 30-keymap-olpc.fdi ${ROOT_DIR}/usr/share/hal/fdi/information/10freedesktop/
+fi
+
+# configure kdm, kde
+if [ -d ${ROOT_DIR}/etc/kde3/kdm ]; then
+    sed --in-place "s/AllowNullPasswd=false/AllowNullPasswd=true/;s/#AutoLoginEnable=true/AutoLoginEnable=true/;s/#AutoLoginUser=fred/AutoLoginUser=${DEFUSER}/" ${ROOT_DIR}/etc/kde3/kdm/kdmrc
+fi
+
+# configure gdm, gnome
+if [ -d ${ROOT_DIR}/etc/gdm ]; then
+    sed -i "s_\[daemon\]_\[daemon\]\n\nGreeter=/usr/lib/gdm/gdmlogin\n\nAutomaticLoginEnable=true\n\nAutomaticLogin=${DEFUSER}_" ${ROOT_DIR}/etc/gdm/gdm.conf
+fi
+if [ -d ${ROOT_DIR}/etc/gconf/2 ]; then
+    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/
+fi
 
 # add default user
-(chroot ${ROOT_DIR} useradd -s /bin/bash ${DEFUSER})
+(chroot ${ROOT_DIR} passwd -l root)
+rm -rf ${ROOT_DIR}/home/*; 	# i have no idea what's adding this crap...
+(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)
@@ -81,9 +215,42 @@ rm -f ${ROOT_DIR}/${k}
 (chroot ${ROOT_DIR} adduser ${DEFUSER} plugdev)
 (chroot ${ROOT_DIR} adduser ${DEFUSER} netdev)
 (chroot ${ROOT_DIR} adduser ${DEFUSER} powerdev)
-echo "${DEFUSER} ALL=(ALL) ALL" >> ${ROOT_DIR}/etc/sudoers
+(chroot ${ROOT_DIR} adduser ${DEFUSER} floppy)
+echo "${DEFUSER} ALL=(ALL) NOPASSWD: ALL" >> ${ROOT_DIR}/etc/sudoers
+
+# add local network interface
+cat >>${ROOT_DIR}/etc/network/interfaces<<EOF
+
+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
+
+# run any local postinstall scripts for the build
+PLIST_DIR=${PLIST/.packages/}
+if [ -d ${PLIST_DIR} ]; then
+    if [ -x ${PLIST_DIR}/postinst.sh ]; then
+	${PLIST_DIR}/postinst.sh ${ROOT_DIR}
+    fi
+    if [ -x ${PLIST_DIR}/postinst-local.sh ]; then
+	${PLIST_DIR}/postinst-local.sh ${ROOT_DIR}
+    fi
+fi
+
+# override sources.list with shipping version
+printf "${APT_SOURCES}\n" >${ROOT_DIR}/etc/apt/sources.list
+(chroot ${ROOT_DIR} aptitude update)
 
 # 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
+chroot_internal_umounts ${ROOT_DIR}