From 65fc6ccb06ca3bac095e0f479d789b02040a321a Mon Sep 17 00:00:00 2001 From: Erwan MAS Date: Sun, 23 Jun 2024 16:27:39 -0400 Subject: [PATCH] tinc: fix regression bring by commit fd61f2d Signed-off-by: Erwan MAS --- net/tinc/Makefile | 2 +- net/tinc/files/tinc.init | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/net/tinc/Makefile b/net/tinc/Makefile index 32881bac3c..712e383360 100644 --- 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 86c2674723..4c502abd7d 100644 --- 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() { -- 2.30.2