X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configs%2Fdebxo-lxde%2Fhooks;h=66bb63a7ffb5d77084e2df36a05ffb1cc2f16d7c;hb=435543f7a3bb9b1bd8ff0c742e5ea67759593bd3;hp=2bd93a6e27aa1ca2c05fc91c109f9fa1ad9c52cd;hpb=db66c3c25d0e75718cf8218587ecc206c7aba4d4;p=xodist

diff --git a/configs/debxo-lxde/hooks b/configs/debxo-lxde/hooks
index 2bd93a6..66bb63a 100644
--- a/configs/debxo-lxde/hooks
+++ b/configs/debxo-lxde/hooks
@@ -22,27 +22,14 @@ customize_chroot_hook()
 	# Any customizations that need to be made to the chroot after the base system
 	# 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
 }
 
@@ -85,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
@@ -95,6 +92,16 @@ EOF
 		sed --in-place "s/NODM_ENABLED=.*$/NODM_ENABLED=true/" ${F}
 	fi
 
+	# configure wicd
+	F=${ROOT_DIR}/etc/wicd/manager-settings.conf
+	if [ -f ${F} ]; then
+		sed --in-place "s/wireless_interface =.*$/wireless_interface = wlan0/" ${F}
+		sed --in-place "s/wired_inferface =.*$/wired_interface = eth0/" ${F}
+		# auto-connect to wired
+		sed --in-place "s/prefer_wired =.*$/prefer_wired = True/" ${F}
+		sed --in-place "s/wired_connect_mode =.*$/wired_connect_mode = 0/" ${F}
+	fi
+
 }
 
 cleanup_chroot_hook()
@@ -104,6 +111,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
 }