--- a/dev/chroot-test/action/go	Sat Dec 18 00:04:05 2010 +0000
+++ b/dev/chroot-test/action/go	Sat Dec 18 12:37:56 2010 +0000
@@ -17,17 +17,7 @@
 /etc/init.d/ssh start
 ssh-keyscan -p 2222 localhost > /etc/ssh/ssh_known_hosts
 
-if [ -e mercurial-server ] ; then
-    aptitude --allow-untrusted --quiet --without-recommends --assume-yes  install \
-        make mercurial xsltproc docbook-xsl openssh-server \
-        python python-support adduser 
-    cd mercurial-server
-    make setup-adduser
-else
-    aptitude --allow-untrusted --quiet --without-recommends --assume-yes  install \
-         debconf python python-support adduser mercurial openssh-server 
-    dpkg -i *.deb
-fi
+. ./install-installables
 
 for user in test1 test2 ; do
     adduser --gecos $user --disabled-password $user
@@ -35,7 +25,8 @@
     su -l -c 'ssh-keygen -N "" -f .ssh/id_rsa -t rsa' $user
 done
 cp /home/test1/.ssh/id_rsa.pub /etc/mercurial-server/keys/root/test1
-su -l -c /usr/local/share/mercurial-server/refresh-auth hg
+
+su -l -c /action/refresh-auth hg
 su -l -c /action/test1 test1
 su -l -c /action/test2 test2
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/chroot-test/action/install-installables	Sat Dec 18 12:37:56 2010 +0000
@@ -0,0 +1,6 @@
+aptitude --allow-untrusted --quiet --without-recommends --assume-yes  install \
+    make mercurial xsltproc docbook-xsl openssh-server \
+    python python-support adduser 
+cd mercurial-server
+make setup-adduser
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/chroot-test/action/refresh-auth	Sat Dec 18 12:37:56 2010 +0000
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+/usr/local/share/mercurial-server/refresh-auth

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/chroot-test/copy-installables	Sat Dec 18 12:37:56 2010 +0000
@@ -0,0 +1,4 @@
+
+hg st -mac0n -X '*.hg' -X 'dev/**' \
+    | cpio -p -0 -d $BACKING/action/mercurial-server
+

--- a/dev/chroot-test/run-test	Sat Dec 18 00:04:05 2010 +0000
+++ b/dev/chroot-test/run-test	Sat Dec 18 12:37:56 2010 +0000
@@ -40,20 +40,17 @@
 touch $BACKING/please-trash-this-system
 mkdir -p $BACKING/etc
 echo "pristine" > $BACKING/etc/debian_chroot
-cp -v dev/chroot-test/policy-rc.d $BACKING/etc/policy-rc.d
+
+SCRIPTS=dev/chroot-test
+
+cp -v $SCRIPTS/policy-rc.d $BACKING/etc/policy-rc.d
 
 mkdir -p $BACKING/var/cache/apt/archives
 echo "Copying deb files out of cache"
 cp $BUILDDIR/aptcache/$DEBVERSION/* $BACKING/var/cache/apt/archives || true
 
-cp -av dev/chroot-test/action $BACKING
-if [ -e debian/rules ] ; then
-    ./dev/debian-build/dbuild 
-    cp build/debian/*.deb $BACKING/action
-else
-    hg st -mac0n -X '*.hg' -X 'dev/**' \
-        | cpio -p -0 -d $BACKING/action/mercurial-server
-fi
+cp -av $SCRIPTS/action $BACKING
+. $SCRIPTS/copy-installables
 
 unionfs-fuse -o cow -o allow_other,suid,dev $BACKING=RW:$PRISTINE=RO $MOUNT