From: Hans Dedecker <dedeckeh@gmail.com>
Date: Sun, 2 Apr 2017 19:13:08 +0000 (+0200)
Subject: netifd: fix fw3 warnings in dhcp script
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7fb03d96105ae3d42c422383bdb36eff76d403e0;p=openwrt%2Fstaging%2Fkaloz.git

netifd: fix fw3 warnings in dhcp script

Fix fw3 warnings in dhcp script in case fw3 is not enabled

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit 20e40db524fb6c391f47619b18bf36bf7932478a)
---

diff --git a/package/network/config/netifd/files/lib/netifd/dhcp.script b/package/network/config/netifd/files/lib/netifd/dhcp.script
index b3a61e2750..e841f91855 100755
--- a/package/network/config/netifd/files/lib/netifd/dhcp.script
+++ b/package/network/config/netifd/files/lib/netifd/dhcp.script
@@ -60,7 +60,7 @@ setup_interface () {
 		ip6rd="${ip6rd#* }"
 		local ip6rdbr="${ip6rd%% *}"
 
-		[ -n "$ZONE" ] || ZONE=$(fw3 -q network $INTERFACE)
+		[ -n "$ZONE" ] || ZONE=$(fw3 -q network $INTERFACE 2>/dev/null)
 		[ -z "$IFACE6RD" -o "$IFACE6RD" = 1 ] && IFACE6RD=${INTERFACE}_6
 
 		json_init