commit b3c0454a6edbee450a110b289b6f2f423b4fa830
author Anthony Young <sleepsonthefloor@gmail.com> Tue Sep 13 01:28:18 2011 -0700
committer Anthony Young <sleepsonthefloor@gmail.com> Tue Sep 13 01:28:18 2011 -0700
tree b54c08ac375f005af5aeb9d5ea47b25bea96387b
parent 5f6c93b1fcb52e5f6a97cc9cc7cf2260b9b711b2

more tweaks to lxc builder

build_lxc.sh

diff --git a/build_lxc.sh b/build_lxc.sh
index 31b370e..1a2cea3 100755
--- a/build_lxc.sh
+++ b/build_lxc.sh
@@ -8,10 +8,13 @@
 CONTAINER_GATEWAY=${CONTAINER_GATEWAY:-192.168.1.1}
 NAMESERVER=${NAMESERVER:-192.168.1.1}
 COPYENV=${COPYENV:-1}
+WARMCACHE=${WARMCACHE:-0}
 
 # Destroy any existing container
 lxc-stop -n $CONTAINER
+sleep 1
 lxc-destroy -n $CONTAINER
+sleep 1
 
 # Create network configuration
 NET_CONF=/tmp/net.conf
@@ -25,12 +28,21 @@
 # Configure the network
 lxc-create -n $CONTAINER -t natty -f $NET_CONF
 
+if [ "$WARMCACHE" = "1" ]; then
+    # Pre-cache files
+    BASECACHE=/var/cache/lxc/natty/rootfs-amd64
+    chroot $BASECACHE apt-get update
+    chroot $BASECACHE apt-get install -y `cat apts/* | cut -d\# -f1 | egrep -v "(rabbitmq|libvirt-bin|mysql-server)"`
+    chroot $BASECACHE pip install `cat pips/*`
+fi
+
 # Where our container lives
 ROOTFS=/var/lib/lxc/$CONTAINER/rootfs/
 
-# Copy over your ssh keys if desired
-if [ $COPYENV ]; then
+# Copy over your ssh keys and env if desired
+if [ "$COPYENV" = "1" ]; then
     cp -pr ~/.ssh $ROOTFS/root/.ssh
+    cp -p ~/.ssh/id_rsa.pub $ROOTFS/root/.ssh/authorized_keys
     cp -pr ~/.gitconfig $ROOTFS/root/.gitconfig
     cp -pr ~/.vimrc $ROOTFS/root/.vimrc
     cp -pr ~/.bashrc $ROOTFS/root/.bashrc
@@ -79,8 +91,10 @@
 cp -pr $CACHEDIR/pip/* $ROOTFS/var/cache/pip/
 
 # Configure cgroup directory
-mkdir -p /cgroup
-mount none -t cgroup /cgroup
+if [ ! -d /cgroup ] ; then
+    mkdir -p /cgroup
+    mount none -t cgroup /cgroup
+fi
 
 # Start our container
 lxc-start -d -n $CONTAINER