projects / librecmc / librecmc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f69d73f)
netifd: fix fw3 warnings in dhcp script
authorHans Dedecker <dedeckeh@gmail.com>
Sun, 2 Apr 2017 19:13:08 +0000 (21:13 +0200)
committerJo-Philipp Wich <jo@mein.io>
Wed, 13 Dec 2017 13:59:50 +0000 (14:59 +0100)
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)

package/network/config/netifd/files/lib/netifd/dhcp.script patch | blob | history

diff --git a/package/network/config/netifd/files/lib/netifd/dhcp.script b/package/network/config/netifd/files/lib/netifd/dhcp.script
index b3a61e27509061f9d6aa849deb45130f88a12161..e841f9185509995835d9a6294648813add11630f 100755 (executable)
--- 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