From c36e312647b848533f8eea1977cae81074dd3120 Mon Sep 17 00:00:00 2001
From: Steven Barth <cyrus@openwrt.org>
Date: Tue, 19 Aug 2014 05:58:44 +0000
Subject: [PATCH] dnsmasq: respect option dhcpv4 disabled in dhcp-config
SVN-Revision: 42216
---
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"
--
GitLab