From: Steven Barth Date: Tue, 19 Aug 2014 06:00:07 +0000 (+0000) Subject: dnsmasq: respect option dhcpv4 disabled in dhcp-config X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1706af326dec9d046049d3855b75e3b4be6528df;p=openwrt%2Fsvn-archive%2Fopenwrt.git dnsmasq: respect option dhcpv4 disabled in dhcp-config SVN-Revision: 42218 --- 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"