aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2017-04-05 20:31:01 +0200
committerDaniel Golle <daniel@makrotopia.org>2017-04-08 17:11:54 +0200
commit1c42598b7da843f11d5777cecd24be84469952cc (patch)
treebdb4036151dcf4bad4b241c7b598e46b46e7dc6e
parent4a4c00e7c4bd3c752fdfecb2c10dc16277e63856 (diff)
downloadupstream-1c42598b7da843f11d5777cecd24be84469952cc.tar.gz
upstream-1c42598b7da843f11d5777cecd24be84469952cc.tar.bz2
upstream-1c42598b7da843f11d5777cecd24be84469952cc.zip
dnsmasq: peacefully coexist with ISC DHCPd
Similar to odhcpd, allow using ISC DHCPd instead of dnsmasq. Disable DHCP and/or DHCP6 in case ISC DHCP is present and enabled. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
-rw-r--r--package/network/services/dnsmasq/files/dnsmasq.init9
1 files changed, 9 insertions, 0 deletions
diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index 5f69be79b4..83553f19cf 100644
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -720,6 +720,15 @@ dnsmasq_start()
DNSMASQ_DHCP_VER=4
fi
+ # Allow DHCP/DHCPv6 to be handled by ISC DHCPD
+ if [ -x /usr/sbin/dhcpd ] ; then
+ if [ -x /etc/init.d/dhcpd ] ; then
+ /etc/init.d/dhcpd enabled && DNSMASQ_DHCP_VER=0
+ fi
+ if [ -x /etc/init.d/dhcpd6 -a "$DNSMASQ_DHCP_VER" -gt 0 ] ; then
+ /etc/init.d/dhcpd6 enabled && DNSMASQ_DHCP_VER=4
+ fi
+ fi
append_bool "$cfg" authoritative "--dhcp-authoritative"
append_bool "$cfg" nodaemon "--no-daemon"