From: Steven Barth <cyrus@openwrt.org>
Date: Fri, 17 Jan 2014 14:00:09 +0000 (+0000)
Subject: dnsmasq: add dnsmasq.d config folder & improve odhcpd coexistence
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9ec0e5df148875b7ce9b020818edff930f00fb26;p=openwrt%2Fstaging%2Fnbd.git

dnsmasq: add dnsmasq.d config folder & improve odhcpd coexistence

SVN-Revision: 39312
---

diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index 0ff987f69c..b5fb58c524 100644
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -158,8 +158,9 @@ dnsmasq() {
 	config_get hostsfile "$cfg" dhcphostsfile
 	[ -e "$hostsfile" ] && xappend "--dhcp-hostsfile=$hostsfile"
 
-	mkdir -p /tmp/hosts
+	mkdir -p /tmp/hosts /tmp/dnsmasq.d
 	xappend "--addn-hosts=/tmp/hosts"
+	xappend "--conf-dir=/tmp/dnsmasq.d"
 
 	local rebind
 	config_get_bool rebind "$cfg" rebind_protection 1
@@ -559,7 +560,12 @@ start_service() {
 	config_foreach dhcp_srv_add srvhost
 	config_foreach dhcp_mx_add mxhost
 	echo >> $CONFIGFILE
-	config_foreach dhcp_add dhcp
+
+	config_get odhcpd_is_active odhcpd maindhcp
+	if [ "$odhcpd_is_active" != "1" ]; then
+		config_foreach dhcp_add dhcp
+	fi
+
 	echo >> $CONFIGFILE
 	config_foreach dhcp_cname_add cname
 	echo >> $CONFIGFILE