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 815f424a66e20292df6cc23f90f689cf5e603c45..2ea73af9474fcb7cdbd596bc2aca427b144d1f68 100644 (file)
--- 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"