server/admin.c: Remove spurious `ping' in usage message.

[tripe] / svc / tripe-ifup.in

diff --git a/svc/tripe-ifup.in b/svc/tripe-ifup.in
index e9e9cb929bde385bea97be14f8188808a938d6f8..63b5b2d684a3b6b3eaadfde71a7f4ce6f997d62d 100644 (file)
--- a/svc/tripe-ifup.in
+++ b/svc/tripe-ifup.in
@@ -124,9 +124,6 @@ case $have6,$# in
       try ip addr add "$a" dev "$ifname"
       haveaddr6=t
     done
-    case ${r6addr+set} in
-      set) try ip route add $r6addr proto static dev "$ifname" ;;
-    esac
     ;;
 esac
 
@@ -149,6 +146,18 @@ case $haveaddr4,$haveaddr6 in
     ;;
 esac
 
+###--------------------------------------------------------------------------
+### Set the peer IPv6 address if any.
+
+## IPv6 point-to-point links seem broken in Linux.  Attach the local and
+## remote addresses by hand.
+set -- $l6addr
+case $have6,$#,${r6addr+set} in
+  t,[1-9]*,set)
+    try ip route add $r6addr proto static dev "$ifname"
+    ;;
+esac
+
 ###--------------------------------------------------------------------------
 ### Set up routing.