Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #19219 from ErwanMAS/backport_modifications_master

Browse source 
tinc: backport  from master modifications
This commit is contained in:
Josef Schlehofer 2022-08-30 16:17:20 +02:00 committed by GitHub
commit 51077c1094
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/tinc/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=tinc PKG_NAME:=tinc
PKG_VERSION:=1.1-git PKG_VERSION:=1.1-git
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=http://tinc-vpn.org/git/tinc PKG_SOURCE_URL:=http://tinc-vpn.org/git/tinc

4
net/tinc/files/tinc.init
View file

@ -61,7 +61,7 @@ append_conf_params() {
for v in $v; do for v in $v; do
# Look up OpenWRT interface names # Look up OpenWRT interface names
[ "$p" = "BindToInterface" ] && { [ "$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" [ -n "$ifname" ] && v="$ifname"
} }
@ -156,7 +156,7 @@ prepare_net() {
section_enabled "$s" || return 1 section_enabled "$s" || return 1
[ -d "$TMP_TINC/$s" ] && rm -rf "$TMP_TINC/$s/" [ -d "$TMP_TINC/$s" ] && rm -rf "$TMP_TINC/$s/"
mkdir -p "$TMP_TINC/$s" mkdir -p "$TMP_TINC/$s/hosts"
[ -d "/etc/tinc/$s" ] && cp -r "/etc/tinc/$s" "$TMP_TINC/" [ -d "/etc/tinc/$s" ] && cp -r "/etc/tinc/$s" "$TMP_TINC/"
# append flags # append flags