aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJordan Sokolic <oofnik@gmail.com>2020-03-19 14:23:22 +0200
committerHans Dedecker <dedeckeh@gmail.com>2020-03-23 08:01:54 +0100
commit39405644d5b97796a633315e0ce7b65f8a1eb3ac (patch)
tree9944ddc04009866415e5d827084b79c99084b28b
parentd5b1f4430f5649a857485341834a48b3420fc0cc (diff)
downloadupstream-39405644d5b97796a633315e0ce7b65f8a1eb3ac.tar.gz
upstream-39405644d5b97796a633315e0ce7b65f8a1eb3ac.tar.bz2
upstream-39405644d5b97796a633315e0ce7b65f8a1eb3ac.zip
dnsmasq: add 'scriptarp' option
Add option 'scriptarp' to uci dnsmasq config to enable --script-arp functions. The default setting is false, meaning any scripts in `/etc/hotplug.d/neigh` intended to be triggered by `/usr/lib/dnsmasq/dhcp-script.sh` will fail to execute. Also enable --script-arp if has_handlers returns true. Signed-off-by: Jordan Sokolic <oofnik@gmail.com> Signed-off-by: Hans Dedecker <dedeckeh@gmail.com> [PKG_RELEASE increase]
-rw-r--r--package/network/services/dnsmasq/Makefile2
-rw-r--r--package/network/services/dnsmasq/files/dnsmasq.init2
2 files changed, 3 insertions, 1 deletions
diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile
index 4a93a2fa30..ad95ccd65d 100644
--- a/package/network/services/dnsmasq/Makefile
+++ b/package/network/services/dnsmasq/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dnsmasq
PKG_UPSTREAM_VERSION:=2.80
PKG_VERSION:=$(subst test,~~test,$(subst rc,~rc,$(PKG_UPSTREAM_VERSION)))
-PKG_RELEASE:=15
+PKG_RELEASE:=16
PKG_SOURCE:=$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).tar.xz
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index 1054f7a12a..408103c6e5 100644
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -866,6 +866,7 @@ dnsmasq_start()
append_bool "$cfg" allservers "--all-servers"
append_bool "$cfg" noping "--no-ping"
append_bool "$cfg" rapidcommit "--dhcp-rapid-commit"
+ append_bool "$cfg" scriptarp "--script-arp"
append_parm "$cfg" logfacility "--log-facility"
@@ -915,6 +916,7 @@ dnsmasq_start()
config_get user_dhcpscript $cfg dhcpscript
if has_handler || [ -n "$user_dhcpscript" ]; then
xappend "--dhcp-script=$DHCPSCRIPT"
+ xappend "--script-arp"
fi
config_get leasefile $cfg leasefile "/tmp/dhcp.leases"