X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/b9066fbb5c1c160eb305a33a3335b77d17e0f502..0a5d7a35ea0cb46755b2a1ab7fc2780d03ec8d7e:/tripe-init.in

diff --git a/tripe-init.in b/tripe-init.in
index 82ada434..e3d835ac 100755
--- a/tripe-init.in
+++ b/tripe-init.in
@@ -29,7 +29,7 @@ fi
 
 test -x $tripe -a -x $tripectl || exit 0
 
-case `$tripe --tunnel` in
+case ${tunnel-`$tripe --tunnels | head -1`} in
   linux)
     case `uname -s` in
       Linux)
@@ -125,6 +125,7 @@ case "$1" in
       ${user+-S-u}${user} \
       ${group+-S-g}${group} \
       ${trace+-S-T}${trace} \
+      ${tunnel+-S-n}${tunnel} \
       ${miscopts}
     for i in 1 2 3 4 give-up; do
       $tripectl help >/dev/null 2>/dev/null && break
@@ -169,12 +170,16 @@ case "$1" in
       $tripectl stats $i | sed 's/^/  /'
     done
     ;;
+  reload)
+    $tripectl reload
+    echo "Keyrings reloaded OK."
+    ;;
   restart | force-reload)
     sh $0 stop
     sh $0 start
     ;;
   *)
-    echo >&2 "usage: $0 start|stop|restart|status|force-reload"
+    echo >&2 "usage: $0 start|stop|restart|status|reload|force-reload"
     exit 1
     ;;
 esac