X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configs%2Fdebxo-sugar%2Fhooks;h=f7657ae048a8f0851a411ce1cf43dcc4f1676ccb;hb=b68738d0f703c38ad6aa8bdce633d01d4d8652f6;hp=a29584ef2532a21a356bad49ebac5995d6a6c5e9;hpb=010cf8527c1f1c85009afb94550035f08e0c3d62;p=xodist

diff --git a/configs/debxo-sugar/hooks b/configs/debxo-sugar/hooks
index a29584e..f7657ae 100644
--- a/configs/debxo-sugar/hooks
+++ b/configs/debxo-sugar/hooks
@@ -44,8 +44,6 @@ Dir {
 	};
 };
 EOF
-
-	
 }
 
 package_configure_hook()
@@ -66,14 +64,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})
@@ -85,10 +85,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 +93,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
 
 	# configure sugar