X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configs%2Fdebxo-awesome%2Fhooks;h=3d8ed1a8f555ae090007fd279c86218cf03fcdd6;hb=2de5dbf2572a415a2d5ead8c3f18d21ea3ab24b7;hp=0af18b5de94f2ff821f31b8b0d60bfdcb298c24a;hpb=ca2365142399dfdfcda74671132c7ae6d027d8df;p=xodist

diff --git a/configs/debxo-awesome/hooks b/configs/debxo-awesome/hooks
index 0af18b5..3d8ed1a 100644
--- a/configs/debxo-awesome/hooks
+++ b/configs/debxo-awesome/hooks
@@ -23,7 +23,8 @@ customize_chroot_hook()
 	# has been installed (but prior to custom package installation) should be
 	# put here.  $ROOT_DIR should be prefixed to any paths.
 	
-	mkdir ${ROOT_DIR}/ofw
+	# OFW needs this to boot w/ partitions
+	ln -s . ${ROOT_DIR}/boot/boot
 	
 	# Apt can't deal w/ jffs2's lack of mmap, so we keep apt's cache on tmpfs
 	# (see <http://bugs.debian.org/314334>).
@@ -41,8 +42,6 @@ Dir {
 	};
 };
 EOF
-
-	
 }
 
 package_configure_hook()
@@ -63,14 +62,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.37-rc1+_2.6.37-rc1+-47_i386.deb"
 	mkdir -p cache
 	for i in $k; do
 		pkg=$(basename ${i})
@@ -82,21 +83,14 @@ 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
 
-	# 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
+	# 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
 
 }