From: Etienne Champetier <champetier.etienne@gmail.com>
Date: Thu, 12 Aug 2021 20:41:05 +0000 (-0400)
Subject: tinc: use 'uci_get_state' instead of 'uci -P /var/state get'
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=440d3c04505719df09e39706e6af7c470a49d458;p=feed%2Fpackages.git

tinc: use 'uci_get_state' instead of 'uci -P /var/state get'

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
---

diff --git a/net/tinc/Makefile b/net/tinc/Makefile
index 945693925f..54936d19af 100644
--- a/net/tinc/Makefile
+++ b/net/tinc/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tinc
 PKG_VERSION:=1.1-git
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://tinc-vpn.org/git/tinc
diff --git a/net/tinc/files/tinc.init b/net/tinc/files/tinc.init
index af2c3bcac0..ba2134fe0f 100644
--- a/net/tinc/files/tinc.init
+++ b/net/tinc/files/tinc.init
@@ -61,7 +61,7 @@ append_conf_params() {
 		for v in $v; do
 			# Look up OpenWRT interface names
 			[ "$p" = "BindToInterface" ] && {
-				local ifname=$(uci -P /var/state get network.$v.ifname 2>&-)
+				local ifname=$(uci_get_state network "$v" ifname "")
 				[ -n "$ifname" ] && v="$ifname"
 			}