odhcpd: dont poke dnsmasq

dnsmasq v2.88 can now remove hosts from dynamically updated hosts files,
thus odhcpd doesn't need to signal dnsmasq on host changes.

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>

diff --git a/package/network/services/odhcpd/Makefile b/package/network/services/odhcpd/Makefile
index 4092588353ba75b019c6384d6b01dfb79787b9e1..3e405bd84db11de23d40c9a50a1c2b98601bf66d 100644 (file)
--- a/package/network/services/odhcpd/Makefile
+++ b/package/network/services/odhcpd/Makefile
@@ -95,7 +95,6 @@ endif
 define Package/odhcpd/install
        $(INSTALL_DIR) $(1)/usr/sbin/
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/odhcpd $(1)/usr/sbin/
-       $(INSTALL_BIN) ./files/odhcpd-update $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/odhcpd.init $(1)/etc/init.d/odhcpd
        $(INSTALL_DIR) $(1)/etc/uci-defaults

diff --git a/package/network/services/odhcpd/files/odhcpd-update b/package/network/services/odhcpd/files/odhcpd-update
deleted file mode 100755 (executable)
index c1814e0..0000000
--- a/package/network/services/odhcpd/files/odhcpd-update
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# Make dnsmasq reread hostfile by sending SIGHUP signal
-
-. /lib/functions/procd.sh
-
-procd_send_signal dnsmasq

diff --git a/package/network/services/odhcpd/files/odhcpd.defaults b/package/network/services/odhcpd/files/odhcpd.defaults
index 1350636ba4300f4ef69508576597de99c0193c1f..48f6036ec549b39a6c1682854909922e2d9b2f1f 100644 (file)
--- a/package/network/services/odhcpd/files/odhcpd.defaults
+++ b/package/network/services/odhcpd/files/odhcpd.defaults
@@ -40,7 +40,6 @@ uci batch <<EOF
 set dhcp.odhcpd=odhcpd
 set dhcp.odhcpd.maindhcp=$ODHCPDONLY
 set dhcp.odhcpd.leasefile=/tmp/hosts/odhcpd
-set dhcp.odhcpd.leasetrigger=/usr/sbin/odhcpd-update
 set dhcp.odhcpd.loglevel=4
 set dhcp.lan.dhcpv4=$V4MODE
 set dhcp.lan.dhcpv6=$V6MODE