From: cyrus <cyrus@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 19 Aug 2014 06:00:07 +0000 (+0000)
Subject: dnsmasq: respect option dhcpv4 disabled in dhcp-config
X-Git-Url: http://git.ozo.com/?p=openwrt-14.07%2F.git;a=commitdiff_plain;h=6566ae535e9b22ef89944c4a32d1ccdaae3e9582

dnsmasq: respect option dhcpv4 disabled in dhcp-config

git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@42218 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index 815f424..2ea73af 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"