From: Andres Salomon <dilinger@collabora.co.uk>
Date: Wed, 27 May 2009 20:20:59 +0000 (-0400)
Subject: rename: initchroot.sh -> mkchroot.sh
X-Git-Tag: v0.6~65
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?p=xodist;a=commitdiff_plain;h=a66726dadd0e9c8a7bf3ec55bebbf0247a869baa

rename: initchroot.sh -> mkchroot.sh

Signed-off-by: Andres Salomon <dilinger@collabora.co.uk>
---

diff --git a/README b/README
index 15025d5..427a67a 100644
--- a/README
+++ b/README
@@ -13,7 +13,7 @@ How to use xodist to generate a Debian KDE image for an OLPC XO:
 
 1.  build the root filesystem,
 
-	sudo ./initchroot.sh --package-list kde.packages kde.root
+	sudo ./mkchroot.sh --package-list kde.packages kde.root
 
 2.  make the JFFS2 filesystem,
 
diff --git a/README.approx b/README.approx
index 512b375..f142c46 100644
--- a/README.approx
+++ b/README.approx
@@ -1,4 +1,4 @@
-Problem: every time you use initchroot.sh the hundreds of megabytes of
+Problem: every time you use mkchroot.sh the hundreds of megabytes of
 packages are downloaded again.
 
 Solution: set up the approx package to cache these packages.
@@ -19,7 +19,7 @@ security        http://security.debian.org/
 4.  follow README, but during the creation of the root filesystem, add
 the --mirror option, like this:
 
-        sudo ./initchroot.sh \
+        sudo ./mkchroot.sh \
             --package-list kde.packages \
             --local-apt-mirror "deb http://localhost:9999/debian lenny main contrib non-free
 deb http://localhost:9999/security lenny/updates main contrib non-free" \
diff --git a/initchroot.sh b/initchroot.sh
deleted file mode 100755
index 2808620..0000000
--- a/initchroot.sh
+++ /dev/null
@@ -1,255 +0,0 @@
-#!/bin/bash -e
-#
-# Copyright © 2008  Andres Salomon <dilinger@queued.net>
-#
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-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
-
-usage()
-{
-	echo "" 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
-}
-
-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
-
-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 ${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
-
-# 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
-printf "${LOCAL_APT_MIRROR}\n" >${ROOT_DIR}/etc/apt/sources.list
-(chroot ${ROOT_DIR} aptitude update)
-
-# 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 `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 
- http://lunge.mit.edu/~dilinger/debxo-0.5/autox_0.1_all.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)
-# take autox off hold
-echo autox 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 `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 autox
-if [ -f ${ROOT_DIR}/etc/default/autox ]; then
-    sed --in-place "s/USER=$/USER=${DEFUSER}/" ${ROOT_DIR}/etc/default/autox
-fi
-
-# configure gnome
-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} 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)
-(chroot ${ROOT_DIR} adduser ${DEFUSER} video)
-(chroot ${ROOT_DIR} adduser ${DEFUSER} plugdev)
-(chroot ${ROOT_DIR} adduser ${DEFUSER} netdev)
-(chroot ${ROOT_DIR} adduser ${DEFUSER} powerdev)
-(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
-    # #?
-    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)
-chroot_internal_umounts ${ROOT_DIR}
diff --git a/mkchroot.sh b/mkchroot.sh
new file mode 100755
index 0000000..2808620
--- /dev/null
+++ b/mkchroot.sh
@@ -0,0 +1,255 @@
+#!/bin/bash -e
+#
+# Copyright © 2008  Andres Salomon <dilinger@queued.net>
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+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
+
+usage()
+{
+	echo "" 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
+}
+
+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
+
+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 ${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
+
+# 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
+printf "${LOCAL_APT_MIRROR}\n" >${ROOT_DIR}/etc/apt/sources.list
+(chroot ${ROOT_DIR} aptitude update)
+
+# 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 `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 
+ http://lunge.mit.edu/~dilinger/debxo-0.5/autox_0.1_all.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)
+# take autox off hold
+echo autox 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 `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 autox
+if [ -f ${ROOT_DIR}/etc/default/autox ]; then
+    sed --in-place "s/USER=$/USER=${DEFUSER}/" ${ROOT_DIR}/etc/default/autox
+fi
+
+# configure gnome
+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} 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)
+(chroot ${ROOT_DIR} adduser ${DEFUSER} video)
+(chroot ${ROOT_DIR} adduser ${DEFUSER} plugdev)
+(chroot ${ROOT_DIR} adduser ${DEFUSER} netdev)
+(chroot ${ROOT_DIR} adduser ${DEFUSER} powerdev)
+(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
+    # #?
+    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)
+chroot_internal_umounts ${ROOT_DIR}
diff --git a/release.sh b/release.sh
index f2c0130..e453292 100755
--- a/release.sh
+++ b/release.sh
@@ -3,7 +3,7 @@
 # prepare a release
 for f in *.packages; do
 	desktop=$(echo $f | sed 's/\.packages//')
-	./initchroot.sh --package-list ${f} \
+	./mkchroot.sh --package-list ${f} \
 			--local-apt-mirror "deb http://localhost:9999/debian lenny main contrib non-free
 deb http://localhost:9999/security lenny/updates main contrib non-free" \
 			debxo-${desktop}