From: John Crispin <john@phrozen.org>
Date: Fri, 16 Dec 2016 09:34:52 +0000 (+0100)
Subject: dnsmasq: fix service reload
X-Git-Tag: v17.01.0-rc1~520
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=93227e4d3fb81332f1dcb6eaa158ddf914ca67a6;p=openwrt%2Fstaging%2Fxback.git

dnsmasq: fix service reload

The SIGHUP also got sent to the reload script making it bail out
with an error

Revert "dnsmasq: reload config if host name is modified"
This reverts commit 854459a2f923376e0e509ebc0fb8ff90e9f13c02.

Reported-by: Hans Dedecker <dedeckeh@gmail.com>
Signed-off-by: John Crispin <john@phrozen.org>
---

diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index 67808d5593..174fbd1ae0 100644
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -785,7 +785,7 @@ dnsmasq_stop()
 
 service_triggers()
 {
-	procd_add_reload_trigger "dhcp" "system"
+	procd_add_reload_trigger "dhcp"
 	procd_add_raw_trigger "interface.*" 2000 /etc/init.d/dnsmasq reload
 }
 
@@ -825,7 +825,6 @@ start_service() {
 
 reload_service() {
 	rc_procd start_service "$@"
-	killall -HUP dnsmasq
 	return 0
 }