packages/collectd: use new service functions

git-svn-id: svn://svn.openwrt.org/openwrt/packages@28948 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2011-11-11 15:46:32 +00:00
parent 7801afab1c
commit c631721351
2 changed files with 8 additions and 21 deletions

View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2006-2010 OpenWrt.org
# Copyright (C) 2006-2011 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=collectd
PKG_VERSION:=4.10.2
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://collectd.org/files/

View File

@ -1,28 +1,15 @@
#!/bin/sh /etc/rc.common
# Copyright (C) 2006-2010 OpenWrt.org
# Copyright (C) 2006-2011 OpenWrt.org
START=80
BINARY="/usr/sbin/collectd"
PIDFILE="/var/run/collectd.pid"
DATADIR="/var/lib/collectd"
SERVICE_USE_PID=1
start() {
[ -x "$BINARY" ] || exit 1
[ -d "$DATADIR" ] || mkdir -p "$DATADIR";
rm -f $PIDFILE
start-stop-daemon -S -q -b -x $BINARY -m -p $PIDFILE -- -f
mkdir -m 0755 -p /var/lib/collectd
service_start /usr/sbin/collectd
}
stop() {
[ -s "$PIDFILE" ] && {
local pid="$(cat $PIDFILE)"
start-stop-daemon -K -q -n ${BINARY##*/} -p $PIDFILE
for i in 1 2 3 4 5; do
kill -0 $pid 2>/dev/null || return
sleep 1
done
}
service_stop /usr/sbin/collectd
}