From 5f6c93b1fcb52e5f6a97cc9cc7cf2260b9b711b2 Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Tue, 13 Sep 2011 00:04:57 -0700
Subject: [PATCH] crude pip caching, remove no-op fstab

---
 build_lxc.sh | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/build_lxc.sh b/build_lxc.sh
index 8d5ef42..31b370e 100755
--- a/build_lxc.sh
+++ b/build_lxc.sh
@@ -13,16 +13,6 @@ COPYENV=${COPYENV:-1}
 lxc-stop -n $CONTAINER
 lxc-destroy -n $CONTAINER
 
-FSTAB=/tmp/fstab
-cat > $FSTAB <<EOF
-none /var/lib/lxc/$CONTAINER/dev/pts devpts defaults 0 0
-none /var/lib/lxc/$CONTAINER/proc proc defaults 0 0
-none /var/lib/lxc/$CONTAINER/sys sysfs defaults 0 0
-none /var/lib/lxc/$CONTAINER/var/lock tmpfs defaults 0 0
-none /var/lib/lxc/$CONTAINER/var/run tmpfs defaults 0 0
-/var/cache/apt/ $APTCACHEDIR none bind 0 0
-EOF
-
 # Create network configuration
 NET_CONF=/tmp/net.conf
 cat > $NET_CONF <<EOF
@@ -30,7 +20,6 @@ lxc.network.type = veth
 lxc.network.link = $BRIDGE
 lxc.network.flags = up
 lxc.network.ipv4 = $CONTAINER_CIDR
-lxc.mount = $FSTAB
 EOF
 
 # Configure the network
@@ -80,12 +69,14 @@ cat > $RC_LOCAL <<EOF
 /root/install.sh
 EOF
 
-# Setup apt cache
+# Setup cache
 # FIXME - use proper fstab mount
 CWD=`pwd`
-APTCACHEDIR=$CWD/cache/apt
-mkdir -p $APTCACHEDIR
-cp -pr $APTCACHEDIR/* $ROOTFS/var/cache/apt/
+CACHEDIR=$CWD/cache/
+mkdir -p $CACHEDIR/apt
+mkdir -p $CACHEDIR/pip
+cp -pr $CACHEDIR/apt/* $ROOTFS/var/cache/apt/
+cp -pr $CACHEDIR/pip/* $ROOTFS/var/cache/pip/
 
 # Configure cgroup directory
 mkdir -p /cgroup