From f87409440298121ae1fbd718a17267cc180438e4 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Tue, 17 Sep 2013 21:45:30 +0000 Subject: procd: convert various packages to procd style init.d scripts Signed-off-by: John Crispin SVN-Revision: 38023 --- .../services/ipset-dns/files/ipset-dns.init | 32 ++++++++-------------- 1 file changed, 12 insertions(+), 20 deletions(-) (limited to 'package/network/services/ipset-dns/files') diff --git a/package/network/services/ipset-dns/files/ipset-dns.init b/package/network/services/ipset-dns/files/ipset-dns.init index 7b732791ea..0a76fcc4cd 100755 --- 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 @@ -38,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" "$ipset6" "$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 -} - -- cgit v1.2.3