X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/797cf76bc51a342ab680c9426a480bd544edf334..a62f8e8a94bf56194539f7140a1215bc74309b36:/init/tripe-init.in

diff --git a/init/tripe-init.in b/init/tripe-init.in
index ddede105..433f6a00 100755
--- a/init/tripe-init.in
+++ b/init/tripe-init.in
@@ -33,7 +33,7 @@ case ${tunnel-`$tripe --tunnels | head -1`} in
   linux)
     case `uname -s` in
       Linux)
-	if { test -f /proc/misc && grep -q net/tun /proc/misc; } ||
+	if { test -f /proc/misc && grep -q tun /proc/misc; } ||
 	   modprobe -q tun; then
 	  : good
 	else
@@ -106,7 +106,7 @@ case ${tunnel-`$tripe --tunnels | head -1`} in
     fi
     ;;
 esac
-  
+
 # --- Do what was wanted ---
 
 case "$1" in
@@ -122,8 +122,8 @@ case "$1" in
       ${keytag+-S-t}$keytag \
       ${addr+-S-b}$addr \
       ${port+-S-p}${port} \
-      ${user+-S-u}${user} \
-      ${group+-S-g}${group} \
+      ${user+-U}${user} \
+      ${group+-G}${group} \
       ${trace+-S-T}${trace} \
       ${tunnel+-S-n}${tunnel} \
       ${miscopts}
@@ -136,17 +136,32 @@ case "$1" in
       exit 1
     fi
     echo -n " tripe"
-    for i in $TRIPEDIR/peers/*; do
+    sep=" services [" end=""
+    [ -d $TRIPEDIR/services ] && for i in $TRIPEDIR/services/*; do
+      [ -x $i ] || continue
+      name=`basename $i`
+      case $name in *~|\#*) continue;; esac
+      if $i --daemon --startup; then
+	echo -n "$sep$name"
+      else
+        echo -n "$sep($name failed)"
+      fi
+      sep=" " end="]"
+    done
+    echo -n "$end"
+    sep=" peers [" end=""
+    [ -d $TRIPEDIR/peers ] && for i in $TRIPEDIR/peers/*; do
       [ -x $i ] || continue
       name=`basename $i`
       case $name in *~|\#*) continue;; esac
-      if $i; then 
-	echo -n " $name"
+      if $i; then
+	echo -n "$sep$name"
       else
-        echo -n " ($name failed)"
+        echo -n "$sep($name failed)"
       fi
+      sep=" " end="]"
     done
-    echo " done"
+    echo "$end done"
     ;;
   stop)
     echo -n "Stopping TrIPE VPN daemon:"