From: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
Date: Thu, 12 Jan 2017 19:28:53 +0000 (+0000)
Subject: dnsmasq: use ubus signalling in ntp hotplug script
X-Git-Tag: v17.01.0-rc1~98
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c914fa04a3cb20f3c4134c3a2c4a4caf7160edd2;p=oweals%2Fopenwrt.git

dnsmasq: use ubus signalling in ntp hotplug script

Use ubus process signalling instead of 'kill pidof dnsmasq' for
SIGHUP signalling to dnsmasq when ntp says time is valid.

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

diff --git a/package/network/services/dnsmasq/files/dnsmasqsec.hotplug b/package/network/services/dnsmasq/files/dnsmasqsec.hotplug
index 5c69314bd9..a155eb0f6e 100644
--- a/package/network/services/dnsmasq/files/dnsmasqsec.hotplug
+++ b/package/network/services/dnsmasq/files/dnsmasqsec.hotplug
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+. /lib/functions/procd.sh
+
 TIMEVALIDFILE="/var/state/dnsmasqsec"
 
 [ "$ACTION" = stratum ] || exit 0
@@ -7,8 +9,6 @@ TIMEVALIDFILE="/var/state/dnsmasqsec"
 [ -f "$TIMEVALIDFILE" ] || {
 	echo "ntpd says time is valid" >$TIMEVALIDFILE
 	/etc/init.d/dnsmasq enabled && {
-		pid=$(pidof dnsmasq)
-		[ "$(readlink /proc/$pid/exe)" = "/usr/sbin/dnsmasq" ] && kill -SIGHUP $pid \
-		|| /etc/init.d/dnsmasq restart
+		procd_send_signal dnsmasq
 	}
 }