aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Barth <cyrus@openwrt.org>2014-08-19 05:58:44 +0000
committerSteven Barth <cyrus@openwrt.org>2014-08-19 05:58:44 +0000
commitc36e312647b848533f8eea1977cae81074dd3120 (patch)
tree7d91081e5c7eb97cb9c7ddbcaec2221373a09256
parent4a9acacf5341933d0f43476b4aa02de81daff457 (diff)
downloadupstream-c36e312647b848533f8eea1977cae81074dd3120.tar.gz
upstream-c36e312647b848533f8eea1977cae81074dd3120.tar.bz2
upstream-c36e312647b848533f8eea1977cae81074dd3120.zip
dnsmasq: respect option dhcpv4 disabled in dhcp-config
SVN-Revision: 42216
-rw-r--r--package/network/services/dnsmasq/files/dnsmasq.init3
1 files changed, 3 insertions, 0 deletions
diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index 815f424a66..2ea73af947 100644
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -373,6 +373,9 @@ dhcp_add() {
config_get net "$cfg" interface
[ -n "$net" ] || return 0
+ config_get dhcpv4 "$cfg" dhcpv4
+ [ "$dhcpv4" != "disabled" ] || return 0
+
config_get networkid "$cfg" networkid
[ -n "$networkid" ] || networkid="$net"