From 1c42598b7da843f11d5777cecd24be84469952cc Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Wed, 5 Apr 2017 20:31:01 +0200 Subject: [PATCH] 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 --- package/network/services/dnsmasq/files/dnsmasq.init | 9 +++++++++ 1 file changed, 9 insertions(+) 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"