[packages_10.03.2] rrdcollect: merge r28957

[10.03/packages.git] / utils / rrdcollect / files / rrdcollect.init

diff --git a/utils/rrdcollect/files/rrdcollect.init b/utils/rrdcollect/files/rrdcollect.init
index 42943bd..9099c4b 100644 (file)
--- a/utils/rrdcollect/files/rrdcollect.init
+++ b/utils/rrdcollect/files/rrdcollect.init
@@ -1,11 +1,10 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 
 START=98
-BIN=rrdcollect
-DEFAULT=/etc/default/$BIN
-RUN_D=/var/run
-PID_F=$RUN_D/$BIN.pid
+
+SERVICE_USE_PID=1
+
 LIB_D=/var/lib/rrdcollect
 CGI_S=$LIB_D/rrd.cgi
 IMG_D=$LIB_D/img
@@ -13,16 +12,14 @@ RRD_D=$LIB_D/rrd
 
 start() {
        RRD_F=$(find $RRD_D -name "*.rrd" 2>/dev/null)
-       [ -f $DEFAULT ] && . $DEFAULT
-       mkdir -p $RUN_D
-       mkdir -p $IMG_D
-       mkdir -p $RRD_D
+       mkdir -m 0755 -p $IMG_D
+       mkdir -m 0755 -p $RRD_D
        [ -n "$RRD_F" ] || /usr/bin/rrd.sh init
        [ -x $CGI_S ] || /usr/bin/rrd.sh cgi
-       $BIN $OPTIONS
+       service_start /usr/sbin/rrdcollect
 }
 
 stop() {
-       [ -f $PID_F ] && kill $(cat $PID_F)
+       service_stop /usr/sbin/rrdcollect
 }