From: Andres Salomon <dilinger@debian.org>
Date: Wed, 20 Aug 2008 18:34:44 +0000 (-0400)
Subject: initchroot: add a workaround for #314334
X-Git-Tag: v0.1^0
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b32b2956e25ab47618c9fb3e72d05ba5de63000;p=xodist

initchroot: add a workaround for #314334

jffs2 doesn't support shared mmap, so apt explodes (#314334).  This
was the reason why we were mounting /var/cache/apt/cache over tmpfs;
readd the mount, and update apt.conf accordingly.

Signed-off-by: Andres Salomon <dilinger@debian.org>
---

diff --git a/functions.sh b/functions.sh
index 5a45aa0..226b8b4 100644
--- a/functions.sh
+++ b/functions.sh
@@ -48,6 +48,7 @@ tmpfs /dev/shm tmpfs defaults,size=15% 0 0
 proc /proc proc defaults 0 0
 sysfs /sys sysfs defaults 0 0
 none /ofw promfs defaults 0 0
+tmpfs /var/cache/apt/cache tmpfs defaults 0 0
 EOF
 }
 
diff --git a/initchroot.sh b/initchroot.sh
index ebcd74c..025f8c2 100755
--- a/initchroot.sh
+++ b/initchroot.sh
@@ -45,9 +45,11 @@ check_for_cmds debootstrap || exit 1
 
 # create chroot
 debootstrap --arch i386 lenny ${ROOT_DIR} http://http.us.debian.org/debian
+mkdir ${ROOT_DIR}/ofw
+mkdir ${ROOT_DIR}/var/cache/apt/cache
 mount -t proc proc ${ROOT_DIR}/proc
 mount -t devpts devpts ${ROOT_DIR}/dev/pts
-mkdir ${ROOT_DIR}/ofw
+mount -t tmpfs tmpfs ${ROOT_DIR}/var/cache/apt/cache
 
 # allow daemons to be installed without breaking
 mv ${ROOT_DIR}/sbin/start-stop-daemon ${ROOT_DIR}/sbin/start-stop-daemon.REAL
@@ -58,12 +60,18 @@ echo "Warning: Fake start-stop-daemon called, doing nothing"
 EOF
 chmod 755 ${ROOT_DIR}/sbin/start-stop-daemon
 
-# set up apt
+# set up apt (working around #314334)
 export DEBIAN_FRONTEND=noninteractive
 export DEBCONF_PRIORITY=critical
 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
 cat >${ROOT_DIR}/etc/apt/sources.list<<EOF
 deb http://http.us.debian.org/debian ${DIST} main contrib non-free
@@ -147,4 +155,4 @@ mv ${ROOT_DIR}/sbin/start-stop-daemon.REAL ${ROOT_DIR}/sbin/start-stop-daemon
 (chroot ${ROOT_DIR} aptitude clean)
 umount ${ROOT_DIR}/proc
 umount ${ROOT_DIR}/dev/pts
-rm -f ${ROOT_DIR}/var/cache/apt/*.bin
+umount ${ROOT_DIR}/var/cache/apt/cache