--- 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