diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2019-09-04 22:49:12 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2019-09-04 22:53:35 +0200 |
| commit | 598fa14ae1fb5737bdf04bcf2eed8e697a2bdec5 (patch) | |
| tree | 186881530031515e93ad934ad57757e13201383e | |
| parent | df57b4dc42f8d8b3d416cbde53479dbe811a6fa3 (diff) | |
fastd: fix init script for multiple VPN instances
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
(cherry picked from commit b7ff8b8087c6e948aba45b74c261cd7337433523)
| -rw-r--r-- | net/fastd/Makefile | 2 | ||||
| -rw-r--r-- | net/fastd/patches/0002-doc-examples-openwrt-fix-init-script-wasn-t-working-.patch | 29 |
2 files changed, 30 insertions, 1 deletions
diff --git a/net/fastd/Makefile b/net/fastd/Makefile index 041a75f48..3fa69f9b8 100644 --- a/net/fastd/Makefile +++ b/net/fastd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fastd PKG_VERSION:=18 -PKG_RELEASE:=2 +PKG_RELEASE:=2.1 PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net> PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz diff --git a/net/fastd/patches/0002-doc-examples-openwrt-fix-init-script-wasn-t-working-.patch b/net/fastd/patches/0002-doc-examples-openwrt-fix-init-script-wasn-t-working-.patch new file mode 100644 index 000000000..b576a9873 --- /dev/null +++ b/net/fastd/patches/0002-doc-examples-openwrt-fix-init-script-wasn-t-working-.patch @@ -0,0 +1,29 @@ +From c29b4b0e3cc5bf68129fd0f94f424950b7888deb Mon Sep 17 00:00:00 2001 +Message-Id: <c29b4b0e3cc5bf68129fd0f94f424950b7888deb.1567630068.git.mschiffer@universe-factory.net> +From: Wilfried Klaebe <wklaebe@users.noreply.github.com> +Date: Sat, 31 Aug 2019 21:44:13 +0200 +Subject: [PATCH] doc: examples/openwrt: fix init script, wasn't working with + two VPNs + +If two VPNs were configured via uci, the init script complained about +the peer group of its peers not matching its net. +--- + doc/examples/openwrt/fastd.init | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/examples/openwrt/fastd.init b/doc/examples/openwrt/fastd.init +index 15737b403ec2..4ba69ece9887 100644 +--- a/doc/examples/openwrt/fastd.init ++++ b/doc/examples/openwrt/fastd.init +@@ -233,7 +233,7 @@ generate_peer_group_config() { + config_get group_parent "$group" parent + [ "$parent" = "$group_parent" ] || return 0 + +- if [ "$net" != "$peer_net" ]; then ++ if [ "$net" != "$group_net" ]; then + [ -z "$parent" ] || error "warning: the parent of peer group '$group' doesn't match its net, the peer group will be ignored" + return 0 + fi +-- +2.23.0 + |