From: Hans Dedecker <dedeckeh@gmail.com>
Date: Mon, 8 Jan 2018 08:02:30 +0000 (+0100)
Subject: omcproxy: silence fw3 warnings
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=377c4a68fee9cc2c4293cf39eb525978ddafa227;p=openwrt%2Fstaging%2Fblocktrron.git

omcproxy: silence fw3 warnings

Silence fw3 warnings in omcproxy init script in case fw3 is not enabled

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
---

diff --git a/package/network/services/omcproxy/Makefile b/package/network/services/omcproxy/Makefile
index 473e968843..28de833a1c 100644
--- a/package/network/services/omcproxy/Makefile
+++ b/package/network/services/omcproxy/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=omcproxy
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE_URL:=https://github.com/sbyx/omcproxy.git
 PKG_SOURCE_PROTO:=git
diff --git a/package/network/services/omcproxy/files/omcproxy.init b/package/network/services/omcproxy/files/omcproxy.init
index a129792087..970b3a128e 100644
--- a/package/network/services/omcproxy/files/omcproxy.init
+++ b/package/network/services/omcproxy/files/omcproxy.init
@@ -51,7 +51,7 @@ omcproxy_add_firewall() {
 	config_get uplink $1 uplink
 	config_get downlink $1 downlink
 
-	upzone=$(fw3 network $uplink)
+	upzone=$(fw3 -q network $uplink 2>/dev/null)
 	[ -n "$upzone" ] || return 0
 
 	json_add_object ""
@@ -77,7 +77,7 @@ omcproxy_add_firewall() {
 	json_close_object
 
 	for network in $downlink; do
-		downzone=$(fw3 network $network)
+		downzone=$(fw3 -q network $network 2>/dev/null)
 		[ -n "$downzone" ] || continue
 
 		json_add_object ""