More debug for sigterm

It's actually the vpnc-script which is failing:

 + '[' connect = connect ']'
+ ip link set dev oc-6352-tun0 up mtu 1434
Error: Device for nexthop is not up.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

diff --git a/tests/scripts/vpnc-script-detect-disconnect b/tests/scripts/vpnc-script-detect-disconnect
index fe6d1c71df7f3a78fbd202a422790ea88b5e9c54..69e2330f4a4b45d55894876d15d7d6cbbe1e2dc2 100755 (executable)
--- a/tests/scripts/vpnc-script-detect-disconnect
+++ b/tests/scripts/vpnc-script-detect-disconnect
@@ -4,7 +4,9 @@
 # For a real one, see http://www.infradead.org/openconnect/vpnc-script.html
 
 if [ "$reason" = "connect" ]; then
-    ip link set dev "$TUNDEV" up mtu "$INTERNAL_IP4_MTU"
+    ip link show "$TUNDEV"
+    ip link set dev "$TUNDEV" up
+    ip link set dev "$TUNDEV" mtu "$INTERNAL_IP4_MTU"
     ip addr add "$INTERNAL_IP4_ADDRESS/32" peer "$INTERNAL_IP4_ADDRESS" dev "$TUNDEV"
     ip -6 addr add $INTERNAL_IP6_NETMASK dev $TUNDEV
     rm -f ${DISCONNECT_FILE}

diff --git a/tests/sigterm b/tests/sigterm
index 04639181a1f09769fa7efc34382cfa53a3a6cf33..8412e7b52ba4134371ecac0051dab15bc34f3556 100755 (executable)
--- a/tests/sigterm
+++ b/tests/sigterm
@@ -33,6 +33,8 @@ export DISCONNECT_FILE=disconnected-ok.$$.tmp
 
 . `dirname $0`/common.sh
 
+set -x
+
 rm -f ${DISCONNECT_FILE}
 
 if test -z "${IP}";then
@@ -123,8 +125,6 @@ ${CMDNS1} ping -c 3 ${VPNADDR}
 test -f "${CLIPID}" && kill $(cat ${CLIPID}) >/dev/null 2>&1
 rm -f "${CLIPID}"
 
-set -x
-
 sleep 5
 
 if ! test -f ${DISCONNECT_FILE};then