From d543b13ffed684683581216e80f0968b58f1a669 Mon Sep 17 00:00:00 2001 From: asvow <88471740+asvow@users.noreply.github.com> Date: Wed, 6 Nov 2024 17:43:16 +0800 Subject: [PATCH] fix: subnet routes & bump version fix #26 --- Makefile | 6 +----- root/etc/init.d/tailscale | 6 +++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 618533f..aadec0b 100644 --- a/Makefile +++ b/Makefile @@ -8,11 +8,7 @@ LUCI_TITLE:=LuCI for Tailscale LUCI_DEPENDS:=+tailscale LUCI_PKGARCH:=all -PKG_VERSION:=1.2.2 - -define Package/luci-app-tailscale/conffiles -/etc/config/tailscale -endef +PKG_VERSION:=1.2.3 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/root/etc/init.d/tailscale b/root/etc/init.d/tailscale index 7a027d9..a405514 100755 --- a/root/etc/init.d/tailscale +++ b/root/etc/init.d/tailscale @@ -107,12 +107,12 @@ custom_instance() { config_get subnetRoutes $cfg 'subnetRoutes' if [ -n "$subnetRoutes" ]; then i=1 - lan_ip=$(uci get network.lan.ipaddr) + ts_ip=$(tailscale ip -4) for route in $subnetRoutes; do uci set network.ts_subnet$i='route' - uci set network.ts_subnet$i.interface='lan' + uci set network.ts_subnet$i.interface='tailscale' uci set network.ts_subnet$i.target=$route - uci set network.ts_subnet$i.gateway=$lan_ip + uci set network.ts_subnet$i.gateway=$ts_ip let i++ done else