[packages_10.03.2] at: merge r27801, r27898, r28909

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30287 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/utils/at/Makefile b/utils/at/Makefile
index d0a3676..fcb0bee 100644 (file)
--- a/utils/at/Makefile
+++ b/utils/at/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=at
 PKG_VERSION:=3.1.12
-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
index e7b097e..6254d29 100755 (executable)
--- a/utils/at/files/atd.init
+++ b/utils/at/files/atd.init
@@ -1,15 +1,23 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2011 OpenWrt.org
+
 START=50
 
+SERVICE_USE_PID=1
+
 start() {
-       [ -d /var/spool/cron/atjobs ] || mkdir -p /var/spool/cron/atjobs
-       [ -d /var/spool/cron/atspool ] || mkdir -p /var/spool/cron/atspool
-       [ -f /var/spool/cron/atspool ] || > /var/spool/cron/atjobs/.SEQ
-       chown -R nobody:nogroup /var/spool/cron/atjobs /var/spool/cron/atspool
-       atd
+       [ -d /var/spool/cron/atjobs ] || {
+               mkdir -m 0755 -p /var/spool/cron/atjobs
+               touch /var/spool/cron/atjobs/.SEQ
+               chown -R nobody:nogroup /var/spool/cron/atjobs
+       }
+       [ -d /var/spool/cron/atspool ] || {
+               mkdir -m 0755 -p /var/spool/cron/atspool
+               chown -R nobody:nogroup /var/spool/cron/atspool
+       }
+       service_start /usr/sbin/atd
 }
 
 stop() {
-       killall atd
+       service_stop /usr/sbin/atd
 }