procd: convert various packages to procd style init.d scripts

[openwrt.git] / package / network / services / ipset-dns / files / ipset-dns.init

diff --git a/package/network/services/ipset-dns/files/ipset-dns.init b/package/network/services/ipset-dns/files/ipset-dns.init
index 5d41539..0a76fcc 100755 (executable)
--- a/package/network/services/ipset-dns/files/ipset-dns.init
+++ b/package/network/services/ipset-dns/files/ipset-dns.init
@@ -3,9 +3,7 @@
 
 START=61
 
-SERVICE_DAEMONIZE=1
-SERVICE_WRITE_PID=1
-
+USE_PROCD=1
 
 find_nameserver() {
        . /lib/functions/network.sh
@@ -21,10 +19,11 @@ find_nameserver() {
 
 start_instance() {
        local cfg="$1"
-       local ipset port dns
+       local ipset ipset6 port dns
 
        config_get ipset "$cfg" ipset
-       [ -n "$ipset" ] || {
+       config_get ipset6 "$cfg" ipset6
+       [ -n "$ipset$ipset6" ] || {
                echo "No ipset specified for instance $cfg" >&2
                return 1
        }
@@ -37,28 +36,22 @@ start_instance() {
 
        config_get port "$cfg" port $((PORT++))
 
-       SERVICE_PID_FILE="/var/run/ipset-dns-$port.pid" \
-               service_start /usr/sbin/ipset-dns "$ipset" "$port" "$dns"
+       procd_open_instance
+       procd_set_param command /usr/sbin/ipset-dns "$ipset" "$ipset6" "$port" "$dns"
+       procd_set_param env NO_DAEMONIZE=1
+       procd_set_param respawn
+       procd_close_instance
+}
+
+service_triggers()
+{
+       procd_add_reload_trigger "ipset-dns"
 }
 
-start() {
+start_service() {
        PORT=53001
        DEFNS="$(find_nameserver)"
 
-       # required by ipset-dns to not daemonize itself
-       export NO_DAEMONIZE=1
-
        config_load ipset-dns
        config_foreach start_instance ipset-dns
 }
-
-stop() {
-       local pid
-       for pid in /var/run/ipset-dns-*.pid; do
-               [ -f "$pid" ] || continue
-               SERVICE_PID_FILE="$pid" \
-                       service_stop /usr/sbin/ipset-dns
-               rm -f "$pid"
-       done
-}
-