# HG changeset patch
# User Paul Crowley <paul@lshift.net>
# Date 1292676702 0
# Node ID 85607df3fd19fe79c42be4607a9de7a95fee884f
# Parent  7d59a0f92c78a20203f7355b439dc4cdc21df6dc# Parent  01eca64f77abbf0da41cd777a365de2a5a02988b
Merge in default

diff -r 7d59a0f92c78 -r 85607df3fd19 dev/chroot-test/action/go
--- a/dev/chroot-test/action/go	Fri Dec 17 23:24:01 2010 +0000
+++ b/dev/chroot-test/action/go	Sat Dec 18 12:51:42 2010 +0000
@@ -10,24 +10,14 @@
 
 #exec > results 2>&1
 
-#aptitude --allow-untrusted --quiet --without-recommends --assume-yes  install mercurial
-#hg --version
-
 aptitude --allow-untrusted --quiet --without-recommends --assume-yes  install \
-    make mercurial xsltproc docbook-xsl openssh-server \
-    python python-support adduser 
-
-#aptitude --allow-untrusted --quiet --without-recommends --assume-yes  install \
-#     debconf python python-support adduser mercurial openssh-server 
-     
+    openssh-server
 
 perl -i -pe 's/^Port 22$/Port 2222/' /etc/ssh/sshd_config
 /etc/init.d/ssh start
 ssh-keyscan -p 2222 localhost > /etc/ssh/ssh_known_hosts
 
-#dpkg -i mercurial-server_1.0-1_all.deb
-cd mercurial-server
-make setup-adduser
+. ./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
 
diff -r 7d59a0f92c78 -r 85607df3fd19 dev/chroot-test/action/install-installables
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/chroot-test/action/install-installables	Sat Dec 18 12:51:42 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
+
diff -r 7d59a0f92c78 -r 85607df3fd19 dev/chroot-test/action/refresh-auth
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/chroot-test/action/refresh-auth	Sat Dec 18 12:51:42 2010 +0000
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+/usr/local/share/mercurial-server/refresh-auth
diff -r 7d59a0f92c78 -r 85607df3fd19 dev/chroot-test/copy-installables
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/chroot-test/copy-installables	Sat Dec 18 12:51:42 2010 +0000
@@ -0,0 +1,4 @@
+
+hg st -mac0n -X '*.hg' -X 'dev/**' \
+    | cpio -p -0 -d $BACKING/action/mercurial-server
+
diff -r 7d59a0f92c78 -r 85607df3fd19 dev/chroot-test/run-test
--- a/dev/chroot-test/run-test	Fri Dec 17 23:24:01 2010 +0000
+++ b/dev/chroot-test/run-test	Sat Dec 18 12:51:42 2010 +0000
@@ -3,6 +3,7 @@
 # Must be root to run this
 
 set -e
+cd $(hg root)
 
 DEBVERSION=sid
 
@@ -16,10 +17,10 @@
     exit -1
 fi
 
-TOPDIR=`pwd`
-mkdir -p $TOPDIR/build/env
-BACKING=$TOPDIR/build/env/backing
-MOUNT=$TOPDIR/build/env/mount
+BUILDDIR=$(pwd)/build
+mkdir -p $BUILDDIR/env
+BACKING=$BUILDDIR/env/backing
+MOUNT=$BUILDDIR/env/mount
 if [ -e $MOUNT ] ; then
     echo "Removing old filesystem"
     # FIXME: evil hack!
@@ -30,7 +31,7 @@
 fi
 if [ -e $BACKING ] ; then
     echo "Copying deb files into cache"
-    cp $BACKING/var/cache/apt/archives/* build/aptcache/$DEBVERSION || true
+    cp $BACKING/var/cache/apt/archives/* $BUILDDIR/aptcache/$DEBVERSION || true
     echo "Deleting old filesystem backing store"
     rm -rf $BACKING
 fi
@@ -39,18 +40,17 @@
 touch $BACKING/please-trash-this-system
 mkdir -p $BACKING/etc
 echo "pristine" > $BACKING/etc/debian_chroot
-cp -v 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 build/aptcache/$DEBVERSION/* $BACKING/var/cache/apt/archives || true
+cp $BUILDDIR/aptcache/$DEBVERSION/* $BACKING/var/cache/apt/archives || true
 
-cp -av action $BACKING
-#hg -R ../mercurial-server archive -r default $BACKING/action/mercurial-server
-( cd $(hg root) && \
-    hg st -mac0n | cpio -p -0 -d $BACKING/action/mercurial-server )
-
-#cp ../mercurial-server/build/debian/mercurial-server_1.0-1_all.deb $BACKING/action
+cp -av $SCRIPTS/action $BACKING
+. $SCRIPTS/copy-installables
 
 unionfs-fuse -o cow -o allow_other,suid,dev $BACKING=RW:$PRISTINE=RO $MOUNT
 
@@ -60,8 +60,3 @@
 
 chroot $MOUNT ./action/go
 
-
-#cat $BACKING/action/results
-
-#rm -rf build/env
-