diff -r cc3dd97f7300 -r 1239880543cf dev/chroot-test/action/go --- a/dev/chroot-test/action/go Fri Dec 17 20:54:28 2010 +0000 +++ b/dev/chroot-test/action/go Sat Dec 18 00:04:05 2010 +0000 @@ -10,24 +10,24 @@ #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 +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 for user in test1 test2 ; do adduser --gecos $user --disabled-password $user