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 473e9688438937b130566e6c806dd9e5fb543812..28de833a1c9d55a22d1d67c33d30adc86dd1fd5d 100644 (file)
--- a/package/network/services/omcproxy/Makefile
+++ b/package/network/services/omcproxy/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=omcproxy
 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
 
 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 a1297920870488a7e56eae23e3f7cba3af0d65e9..970b3a128ebffa2aac0f22f4fd319fc97cec7875 100644 (file)
--- 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
 
        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 ""
        [ -n "$upzone" ] || return 0
 
        json_add_object ""


@@ -77,7 +77,7 @@ omcproxy_add_firewall() {
        json_close_object
 
        for network in $downlink; do
        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 ""
                [ -n "$downzone" ] || continue
 
                json_add_object ""