[LEDE-DEV] dnsmasq: please revert/disable "dhcp-script" feature by default

[e9hack]

Am 01.06.2017 um 17:07 schrieb Dirk Brenken:

> For testing, I've asked these users to comment the following line in
> /etc/init.d/dnsmasq and to restart dnsmasq and adblock afterwards.
> 
> #       xappend "--dhcp-script=$DHCPSCRIPT"
> 
> After that change everything is working fine again, as long as only one
> instance of dnsmasq runs.

I did fix this for me by adding the '--dhcp-script=$DHCPSCRIPT' parameter only, if one of the hotplug directories isn't
empty:

################
--- a/package/network/services/dnsmasq/Makefile
+++ b/package/network/services/dnsmasq/Makefile
@@ -832,7 +860,9 @@ dnsmasq_start()
 	config_get_bool readethers "$cfg" readethers
 	[ "$readethers" = "1" -a \! -e "/etc/ethers" ] && touch /etc/ethers

-	xappend "--dhcp-script=$DHCPSCRIPT"
+	if [ `ls -1a /etc/hotplug.d/dhcp|wc -l` -gt 2 -o `ls -1a /etc/hotplug.d/neigh|wc -l` -gt 2 -o `ls -1a
/etc/hotplug.d/tftp|wc -l` -gt 2 ]; then
+		xappend "--dhcp-script=$DHCPSCRIPT"
+	fi
 	config_get user_dhcpscript $cfg dhcpscript

 	config_get leasefile $cfg leasefile "/tmp/dhcp.leases"
################

Regards,
Hartmut