Capture syslog in adt-full, but only for serverc

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/adt/acommon b/adt/acommon
index 4c310c0877d71c1e0f47806be4ba26e54558cfe1..bb8aa745b46e0eae7fb751cb3fe16fa481a7db21 100644 (file)
--- a/adt/acommon
+++ b/adt/acommon
@@ -26,7 +26,7 @@ test-prep () {
        tmp=$AUTOPKGTEST_TMP
     else
        tmp=$PWD/tmp/$tname
-       host-cleanup
+       hosts-cleanup
        mkdir -p tmp
        rm -rf "$tmp"
        mkdir "$tmp"
@@ -58,7 +58,7 @@ filesystem-prep () {
     done
 }
 
-host-cleanup () {
+hosts-cleanup () {
     host-cleanup client
     host-cleanup server
 }
@@ -166,7 +166,6 @@ setup-host () {
     in- $cs apt-get -y autoremove
 
     in- $cs service userv start
-    in- $cs service rsyslog start
 
     configure $cs
 
@@ -182,6 +181,8 @@ finish-setup-host-server () {
     in- server iptables -D INPUT -j empty -s 192.0.2.0/24 ||:
     in- server iptables -N empty ||:
     in- server iptables -I INPUT -j empty -s 192.0.2.0/24
+    rsyslog-capture-daemon in- server
+    in- server service rsyslog start
 }
 
 in- () {
@@ -194,12 +195,17 @@ in- () {
 
 setup-pair () {
     test-prep
-    on_failure=host-cleanup
+    on_failure=pair-on-failure
     $test/netns-setup $tname
     setup-host client
     setup-host server
 }
 
+pair-on-failure () {
+    tail -100 "$tmp"/server-overlay/var/log/daemon.log ||:
+    hosts-cleanup
+}
+
 rsyslog-capture-daemon () {
     "$@" dd <<END of=/etc/rsyslog.d/hippotat.conf
 daemon.*       /var/log/daemon.log