debxo: one final tweak for ubifs support..

[xodist] / configs / debxo-xfce / hooks

diff --git a/configs/debxo-xfce/hooks b/configs/debxo-xfce/hooks
index 140849187e22e65e2260f6dac4f2708c808f40ae..e80bff9fa5d9a5d83efbb6161050e6377769442d 100644 (file)
--- a/configs/debxo-xfce/hooks
+++ b/configs/debxo-xfce/hooks
@@ -45,7 +45,8 @@ Dir {
 };
 EOF
 
-       
+       # add archive key for lenny-backports
+       wget -O - http://backports.org/debian/archive.key | (chroot ${ROOT_DIR} apt-key add -)
 }
 
 package_configure_hook()
@@ -66,14 +67,16 @@ scx200_acb
 i8042
 olpc_battery
 msr
+EOF
+
+       # UBIFS needs this
+       cat >>${ROOT_DIR}/etc/initramfs-tools/modules<<EOF
+ubi mtd=root
 EOF
 
        # install some custom packages that aren't on mirrors.  ugly hack!
-       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"
+       k="http://lunge.mit.edu/~dilinger/debxo-0.2/ofw-config_0.1_all.deb 
+ http://lunge.mit.edu/~dilinger/debxo-0.6/linux-image-2.6.36+_2.6.36+-14_i386.deb"
        mkdir -p cache
        for i in $k; do
                pkg=$(basename ${i})
@@ -85,10 +88,6 @@ EOF
                rm -f ${ROOT_DIR}/${pkg}
        done
 
-       # take some packages that are okay to upgrade off hold
-       echo xserver-xorg-video-geode install | (chroot ${ROOT_DIR} dpkg --set-selections)
-       echo autox install | (chroot ${ROOT_DIR} dpkg --set-selections)
-
        # No longer a need for xorg.conf
        rm -f ${ROOT_DIR}/etc/X11/xorg.conf
 
@@ -97,9 +96,11 @@ EOF
                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
+       # configure nodm
+       F=${ROOT_DIR}/etc/default/nodm
+       if [ -f ${F} ]; then
+               sed --in-place "s/NODM_USER=.*$/NODM_USER=${DEFUSER}/" ${F}
+               sed --in-place "s/NODM_ENABLED=.*$/NODM_ENABLED=true/" ${F}
        fi
 
 }