initchroot: update kernel to -144

[xodist] / initchroot.sh

diff --git a/initchroot.sh b/initchroot.sh
index aa679482e3dfb7a9fce92a1c03bb286aeaf04b3d..cce9f0447bbd381e6713260cf7471814bbd2e1cb 100755 (executable)
--- a/initchroot.sh
+++ b/initchroot.sh
@@ -55,6 +55,10 @@ do
                ;;
        --package-list)
                PLIST=$2
+               [ -f ${PLIST} ] || {
+                       echo "Error: can't find file '${PLIST}'!" 1>&2
+                       exit 2
+               }
                shift
                ;;
        --mirror)
@@ -129,16 +133,30 @@ ${OTHERMIRROR}
 EOF
 (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)
+(chroot ${ROOT_DIR} aptitude install -y `cat base.packages`)
 
-k=$(wget -O- http://queued.mit.edu/~dilinger/builds-master/ | sed -ne 's/.*href="\(.\+\)_i386.deb".*/\1_i386.deb/p' | tail -n1)
+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.2/linux-2.6.25.15_2.6.25.15-144_i386.deb"
 mkdir -p cache
-wget --continue -O cache/${k} http://queued.mit.edu/~dilinger/builds-master/${k}
-cp cache/${k} ${ROOT_DIR}/${k} 
-(chroot ${ROOT_DIR} dpkg -i /${k})
-rm -f ${ROOT_DIR}/${k}
+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})
+       rm -f ${ROOT_DIR}/${pkg}
+done
+
+# ensure certain modules get loaded during boot
+cat >>${ROOT_DIR}/etc/modules<<EOF
+lxfb
+fbcon
+olpc_dcon
+scx200_acb
+i8042
+EOF
 
 echo "debxo" > ${ROOT_DIR}/etc/hostname
 cat >${ROOT_DIR}/etc/hosts<<EOF
@@ -184,12 +202,12 @@ 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=olpc/' ${ROOT_DIR}/etc/kde3/kdm/kdmrc
+    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=olpc_' ${ROOT_DIR}/etc/gdm/gdm.conf
+    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
@@ -212,7 +230,17 @@ rm -rf ${ROOT_DIR}/home/*;         # i have no idea what's adding this crap...
 (chroot ${ROOT_DIR} adduser ${DEFUSER} netdev)
 (chroot ${ROOT_DIR} adduser ${DEFUSER} powerdev)
 (chroot ${ROOT_DIR} adduser ${DEFUSER} floppy)
-echo "${DEFUSER} ALL=(ALL) ALL" >> ${ROOT_DIR}/etc/sudoers
+echo "${DEFUSER} ALL=(ALL) NOPASSWD: ALL" >> ${ROOT_DIR}/etc/sudoers
+
+# 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