tinc: fix regression bring by commit fd61f2d

Signed-off-by: Erwan MAS <erwan@mas.nom.fr>

diff --git a/net/tinc/Makefile b/net/tinc/Makefile
index 32881bac3cd867db12500c797461156d4560769f..712e383360597f05692af9ee9800eab525da50ca 100644 (file)
--- a/net/tinc/Makefile
+++ b/net/tinc/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tinc
 PKG_VERSION:=1.1pre18
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://tinc-vpn.org/packages

diff --git a/net/tinc/files/tinc.init b/net/tinc/files/tinc.init
index 86c267472313d6a0f95157fff316c04f2d2270c8..4c502abd7d29a48f4647d55af115e8a7b7a75147 100644 (file)
--- a/net/tinc/files/tinc.init
+++ b/net/tinc/files/tinc.init
@@ -249,7 +249,10 @@ start_instance() {
        append_params "$s" logfile debug
 
        SERVICE_PID_FILE="/var/run/tinc.$s.pid"
-       service_start $BIN -c "$TMP_TINC/$s" $ARGS --pidfile="$SERVICE_PID_FILE"
+       # consequences of option -n "%s"
+       # tinc will display this warning Both netname and configuration directory given, using the latter...
+       # BUT the exported variable NETNAME will be set with the right value when run tinc-up script
+       service_start $BIN -c "$TMP_TINC/$s" -n "$s" $ARGS --pidfile="$SERVICE_PID_FILE"
 }
 
 stop_instance() {