aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Dedecker <dedeckeh@gmail.com>2019-02-09 20:48:11 +0100
committerHans Dedecker <dedeckeh@gmail.com>2019-02-09 21:04:08 +0100
commit7f33f3d7126f543e2d03276aa3508edbfed80a73 (patch)
tree8a37c18016f50fbe1ed7d87535dc7ed8f506f68b
parent945bcaf6ec0f32bfe8949601e82cb146e7f90660 (diff)
downloadupstream-7f33f3d7126f543e2d03276aa3508edbfed80a73.tar.gz
upstream-7f33f3d7126f543e2d03276aa3508edbfed80a73.tar.bz2
upstream-7f33f3d7126f543e2d03276aa3508edbfed80a73.zip
ipip: remove setting default firewall zone to wan
Same reasoning as in bdedb798150a58ad7ce3c4741f2f31df97e84c3f; don't set default firewall zone to wan as the firewall zone for the ipip interface can be configured in the firewall config or it makes it impossible not to specify a firewall zone for the ipip interface. Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
-rw-r--r--package/network/config/ipip/Makefile2
-rwxr-xr-xpackage/network/config/ipip/files/ipip.sh2
2 files changed, 1 insertions, 3 deletions
diff --git a/package/network/config/ipip/Makefile b/package/network/config/ipip/Makefile
index 9bdb13c6bc..252534f198 100644
--- a/package/network/config/ipip/Makefile
+++ b/package/network/config/ipip/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ipip
PKG_VERSION:=1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_LICENSE:=GPL-2.0
include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/config/ipip/files/ipip.sh b/package/network/config/ipip/files/ipip.sh
index f1c94d6eed..15b1c978e3 100755
--- a/package/network/config/ipip/files/ipip.sh
+++ b/package/network/config/ipip/files/ipip.sh
@@ -47,8 +47,6 @@ proto_ipip_setup() {
fi
}
- [ -z "$zone" ] && zone="wan"
-
proto_init_update "ipip-$cfg" 1
proto_add_tunnel