X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configs%2Fdebxo-sugar%2Fhooks;h=0a5487369108dc4667d55ed00eb5b4e2410a3546;hb=28840f12354790a41fb9e2658226a53e10a76913;hp=7ae367e130d9a708f655c01b01c3b9cf758cb51b;hpb=2de5dbf2572a415a2d5ead8c3f18d21ea3ab24b7;p=xodist

diff --git a/configs/debxo-sugar/hooks b/configs/debxo-sugar/hooks
index 7ae367e..0a54873 100644
--- a/configs/debxo-sugar/hooks
+++ b/configs/debxo-sugar/hooks
@@ -26,21 +26,10 @@ customize_chroot_hook()
 	# 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
 }
 
@@ -71,7 +60,7 @@ EOF
 
 	# install some custom packages that aren't on mirrors.  ugly hack!
 	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"
+ http://lunge.mit.edu/~dilinger/debxo-0.6/linux-image-2.6.37-rc4+_2.6.37-rc4+-56_i386.deb"
 	mkdir -p cache
 	for i in $k; do
 		pkg=$(basename ${i})
@@ -83,8 +72,18 @@ EOF
 		rm -f ${ROOT_DIR}/${pkg}
 	done
 
-	# No longer a need for xorg.conf
-	rm -f ${ROOT_DIR}/etc/X11/xorg.conf
+	# 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 nodm
 	F=${ROOT_DIR}/etc/default/nodm
@@ -110,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
 }