dnsmasq: respect option dhcpv4 disabled in dhcp-config
authorcyrus <cyrus@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Tue, 19 Aug 2014 05:58:44 +0000 (05:58 +0000)
committercyrus <cyrus@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Tue, 19 Aug 2014 05:58:44 +0000 (05:58 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42216 3c298f89-4303-0410-b956-a3cf2f4a3e73

package/network/services/dnsmasq/files/dnsmasq.init

index 815f424..2ea73af 100644 (file)
@@ -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"