From 1a8998716c702c3f1e8e4d46c5486027df67234b Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Tue, 19 Aug 2014 06:00:07 +0000 Subject: [PATCH] dnsmasq: respect option dhcpv4 disabled in dhcp-config SVN-Revision: 42218 --- package/network/services/dnsmasq/files/dnsmasq.init | 3 +++ 1 file changed, 3 insertions(+) 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" -- 2.30.2