X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configs%2Fdebxo-gnome%2Fhooks;h=91b2cfac4007dd182f3f6440f341fb136c01edc2;hb=69eddf3b30825ff1f797b58d741e8d920dc0b9f6;hp=a3365dba20e71b6cbf6c0ee1564803f2df4c83c2;hpb=010cf8527c1f1c85009afb94550035f08e0c3d62;p=xodist

diff --git a/configs/debxo-gnome/hooks b/configs/debxo-gnome/hooks
index a3365db..91b2cfa 100644
--- a/configs/debxo-gnome/hooks
+++ b/configs/debxo-gnome/hooks
@@ -24,29 +24,14 @@ 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>).
-	mkdir ${ROOT_DIR}/var/cache/apt/cache
-	mount -t tmpfs tmpfs ${ROOT_DIR}/var/cache/apt/cache
-	# XOs are slow and small; don't use pdiffs, don't install recommends, and
-	# work around lack of mmap.
+	# XOs are slow and small; don't use pdiffs and don't install recommends
 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
-
-	
 }
 
 package_configure_hook()
@@ -67,13 +52,15 @@ 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"
+	k="http://lunge.queued.net/~dilinger/debxo-0.2/ofw-config_0.1_all.deb"
 	mkdir -p cache
 	for i in $k; do
 		pkg=$(basename ${i})
@@ -85,16 +72,18 @@ 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)
-
-	# 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
+	# Create an Xorg.conf that overrides the default DPI (x bug workaround).
+	cat >${ROOT_DIR}/etc/X11/xorg.conf<<EOF
+Section "Monitor"
+	Identifier "Monitor0"
+	DisplaySize 200 150
+EndSection
+
+Section "Screen"
+	Identifier "Default Screen"
+	Monitor "Monitor0"
+EndSection
+EOF
 
 	# configure gnome
 	if [ -d ${ROOT_DIR}/etc/gconf/2 ]; then
@@ -120,6 +109,4 @@ cleanup_chroot_hook()
 	# Any customizations that need to be made after the chroot creation is
 	# complete should be put here.  $ROOT_DIR should be prefixed to any
 	# paths.
-
-	umount ${ROOT_DIR}/var/cache/apt/cache
 }