commit fe4121b49f0cdc2e6528b61cbc40d0bcb132a677 parent 0421b321310e252919e83a43d653317ec88acbb0 Author: Ted Hess <thess@kitschensync.net> Date: Wed, 18 Nov 2015 14:50:41 -0500 Merge pull request #1981 from philenotfound/master at: update init script to use procd Diffstat:
| M | utils/at/Makefile | | | 2 | +- |
| M | utils/at/files/atd.init | | | 17 | ++++++++++------- |
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/utils/at/Makefile b/utils/at/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=at PKG_VERSION:=3.1.16 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/a/at diff --git a/utils/at/files/atd.init b/utils/at/files/atd.init @@ -1,11 +1,11 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2011 OpenWrt.org +# Copyright (C) 2015 OpenWrt.org START=50 -SERVICE_USE_PID=1 +USE_PROCD=1 -start() { +start_service() { [ -d /var/spool/cron/atjobs ] || { mkdir -m 0755 -p /var/spool/cron/atjobs touch /var/spool/cron/atjobs/.SEQ @@ -15,9 +15,12 @@ start() { mkdir -m 0755 -p /var/spool/cron/atspool chown -R nobody:nogroup /var/spool/cron/atspool } - service_start /usr/sbin/atd -} + procd_open_instance + + procd_set_param command /usr/sbin/atd -f + procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-5} + procd_set_param stdout 1 # forward stdout of the command to logd + procd_set_param stderr 1 # same for stderr -stop() { - service_stop /usr/sbin/atd + procd_close_instance }