tinc: fix init.d/tinc parameter generation and logfile config name

tinc expects long parameters to be in the form "--name=value" and the
current init scripts generate "--name value" parameters. See `tincd
--help` to confirm. Also, the config/tinc and init.d/tinc incorrectly
use the parameter "log" when it should be "logfile".

Signed-off-by: Sandy McArthur, Jr. <Sandy@McArthur.org>
SVN-Revision: 36508

diff --git a/net/tinc/files/tinc.config b/net/tinc/files/tinc.config
index f9f2b53f837789f0100617d2ceef446362ed7dfd..18940781aa8503ec2b773164a0711630b7d1aabf 100644 (file)
--- a/net/tinc/files/tinc.config
+++ b/net/tinc/files/tinc.config
@@ -4,7 +4,7 @@ config tinc-net NETNAME
        ## Daemon Configuration (cmd arguments)
        #option generate_keys 0
        #option key_size 2048
-       #option log /tmp/log/tinc.NETNAME.log
+       #option logfile /tmp/log/tinc.NETNAME.log
        #option debug 3
 
        ## Server Configuration (tinc.conf)

diff --git a/net/tinc/files/tinc.init b/net/tinc/files/tinc.init
index 9ab1bd00c495b3ee091c4a302054bdb2cb4186e6..b24bc682ecef4e576c1b6be90f2780a53422d4c6 100644 (file)
--- a/net/tinc/files/tinc.init
+++ b/net/tinc/files/tinc.init
@@ -42,7 +42,7 @@ append_params() {
                config_get v "$s" "$p"
                IFS="$LIST_SEP"
                for v in $v; do
-                       [ -n "$v" ] && append_param "$p" && ARGS="$ARGS $v"
+                       [ -n "$v" ] && append_param "$p" && ARGS="$ARGS=$v"
                done
                unset IFS
        done
@@ -169,7 +169,7 @@ start_instance() {
        ARGS=""
 
        # append params
-       append_params "$s" log debug
+       append_params "$s" logfile debug
 
        SERVICE_PID_FILE="/var/run/tinc.$s.pid"
        service_start $BIN -c "$TMP_TINC/$s" -n $s $ARGS --pidfile="$SERVICE_PID_FILE"