tailscale: fix fw_mode env by using append_param

The previous commit 09c14817 introduced TS_NO_LOGS_NO_SUPPORT but
used procd_set_param for a subsequent environment variable. This
overwrote the previous env setting, causing fw_mode to be missed.

Switch to procd_append_param to ensure all environment variables are
properly passed to the process.

Signed-off-by: Tung-Yi Chen <redacted>

diff --git a/net/tailscale/Makefile b/net/tailscale/Makefile
index 7bbb930ca95c62943a3003644f064da312e56e65..81c2143a00601be0f7c9004371489673a1279a7e 100644 (file)
--- a/net/tailscale/Makefile
+++ b/net/tailscale/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tailscale
 PKG_VERSION:=1.94.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/tailscale/tailscale/tar.gz/v$(PKG_VERSION)?

diff --git a/net/tailscale/files/tailscale.init b/net/tailscale/files/tailscale.init
index f0033f086e6ef3d073cdcce855a5803591b01903..343e33ae315ed200489045c05b5d6a06802dc17f 100644 (file)
--- a/net/tailscale/files/tailscale.init
+++ b/net/tailscale/files/tailscale.init
@@ -31,7 +31,7 @@ start_service() {
   procd_set_param env TS_DEBUG_FIREWALL_MODE="$fw_mode"
 
   # Disable logging to log.tailscale.com
-  procd_set_param env TS_NO_LOGS_NO_SUPPORT=true
+  procd_append_param env TS_NO_LOGS_NO_SUPPORT=true
 
   # Set the port to listen on for incoming VPN packets.
   # Remote nodes will automatically be informed about the new port number,