Revert "dnsmasq: use "hostsdir" instead of "addn-hosts""

[openwrt/openwrt.git] / package / network / services / dnsmasq / files / dnsmasq.init

diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index 204e27d9cffd784bb283d51bdc0ab33a787684b1..2c71a777c33bec788650a666a1da2fb2b6fa1cfb 100644 (file)
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -1027,7 +1027,7 @@ dnsmasq_start()
 
 dnsmasq_stop()
 {
-       local cfg="$1"
+       local cfg="$1" resolvfile
 
        config_get resolvfile "$cfg" "resolvfile"
 
@@ -1042,10 +1042,22 @@ dnsmasq_stop()
        rm -f ${BASEDHCPSTAMPFILE}.${cfg}.*.dhcp
 }
 
+add_interface_trigger()
+{
+       local interface ignore
+
+       config_get interface "$1" interface
+       config_get_bool ignore "$1" ignore 0
+
+       [ -n "$interface" -a $ignore -eq 0 ] && procd_add_interface_trigger "interface.*" "$interface" /etc/init.d/dnsmasq reload
+}
+
 service_triggers()
 {
        procd_add_reload_trigger "dhcp" "system"
-       procd_add_raw_trigger "interface.*" 2000 /etc/init.d/dnsmasq reload
+
+       config_load dhcp
+       config_foreach add_interface_trigger dhcp
 }
 
 boot()
@@ -1084,7 +1096,7 @@ start_service() {
 
 reload_service() {
        rc_procd start_service "$@"
-       return 0
+       procd_send_signal dnsmasq "$@"
 }
 
 stop_service() {