--- a/run-test	Tue Dec 15 15:35:50 2009 +0000
+++ b/run-test	Fri Dec 17 14:31:50 2010 +0000
@@ -8,10 +8,30 @@
 
 PRISTINE=/var/local/cache/pristine/$DEBVERSION
 
+if [ ! -e $PRISTINE ] ; then
+    echo "Debian pristine image not found, try running create-source-image"
+    echo $PRISTINE
+    exit -1
+fi
+
 TOPDIR=`pwd`
+mkdir -p $TOPDIR/build/env
 BACKING=$TOPDIR/build/env/backing
 MOUNT=$TOPDIR/build/env/mount
-mkdir -p $TOPDIR/build/env
+if [ -e $MOUNT ] ; then
+    echo "Removing old filesystem"
+    # FIXME: evil hack!
+    chroot $MOUNT /etc/init.d/ssh stop || true
+    umount $MOUNT/proc || true
+    umount $MOUNT || true
+    rm -rf $MOUNT
+fi
+if [ -e $BACKING ] ; then
+    echo "Copying deb files into cache"
+    cp $BACKING/var/cache/apt/archives/* build/aptcache/$DEBVERSION || true
+    echo "Deleting old filesystem backing store"
+    rm -rf $BACKING
+fi
 mkdir $BACKING $MOUNT
 
 touch $BACKING/please-trash-this-system
@@ -20,7 +40,8 @@
 cp -v policy-rc.d $BACKING/etc/policy-rc.d
 
 mkdir -p $BACKING/var/cache/apt/archives
-cp -v build/aptcache/$DEBVERSION/* $BACKING/var/cache/apt/archives || true
+echo "Copying deb files out of cache"
+cp build/aptcache/$DEBVERSION/* $BACKING/var/cache/apt/archives || true
 
 cp -av action $BACKING
 #hg -R ../mercurial-server archive -r default $BACKING/action/mercurial-server
@@ -37,10 +58,8 @@
 
 chroot $MOUNT ./action/go
 
-umount $MOUNT/proc
-umount $MOUNT
 
 #cat $BACKING/action/results
 
-rm -rf build/env
+#rm -rf build/env