bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@36508 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
luka 2013-05-02 00:49:05 +00:00
parent 0f28460a01
commit b8c4b0401d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/tinc/files/tinc.config
View File

@ -4,7 +4,7 @@ config tinc-net NETNAME
## Daemon Configuration (cmd arguments) ## Daemon Configuration (cmd arguments)
#option generate_keys 0 #option generate_keys 0
#option key_size 2048 #option key_size 2048
#option log /tmp/log/tinc.NETNAME.log #option logfile /tmp/log/tinc.NETNAME.log
#option debug 3 #option debug 3
## Server Configuration (tinc.conf) ## Server Configuration (tinc.conf)

4
net/tinc/files/tinc.init
View File

@ -42,7 +42,7 @@ append_params() {
config_get v "$s" "$p" config_get v "$s" "$p"
IFS="$LIST_SEP" IFS="$LIST_SEP"
for v in $v; do for v in $v; do
[ -n "$v" ] && append_param "$p" && ARGS="$ARGS $v" [ -n "$v" ] && append_param "$p" && ARGS="$ARGS=$v"
done done
unset IFS unset IFS
done done
@ -169,7 +169,7 @@ start_instance() {
ARGS="" ARGS=""
# append params # append params
append_params "$s" log debug append_params "$s" logfile debug
SERVICE_PID_FILE="/var/run/tinc.$s.pid" SERVICE_PID_FILE="/var/run/tinc.$s.pid"
service_start $BIN -c "$TMP_TINC/$s" -n $s $ARGS --pidfile="$SERVICE_PID_FILE" service_start $BIN -c "$TMP_TINC/$s" -n $s $ARGS --pidfile="$SERVICE_PID_FILE"