packages/pmacct: use new service functions

SVN-Revision: 28890

diff --git a/admin/pmacct/Makefile b/admin/pmacct/Makefile
index cc17ca453f7c95ba43e786a363a9bb081d3f2c54..638fa637d22e02eb336ee4f5b3f24c322df5d26f 100644 (file)
--- a/admin/pmacct/Makefile
+++ b/admin/pmacct/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pmacct
 PKG_VERSION:=0.12.5
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.pmacct.net/

diff --git a/admin/pmacct/files/nfacctd.init b/admin/pmacct/files/nfacctd.init
index e1113571c269085d3a37aa2542b194ecb815440a..66b9021919d16e052ca488189a6c4a382b372e59 100644 (file)
--- a/admin/pmacct/files/nfacctd.init
+++ b/admin/pmacct/files/nfacctd.init
@@ -1,18 +1,19 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
+
 START=50
 
-BIN=nfacctd
-DEFAULT=/etc/default/$BIN
-RUN_D=/var/run
-PID_F=$RUN_D/$BIN.pid
+SERVICE_USE_PID=1
+
+PROG="nfacctd"
+DEFAULT="/etc/default/$PROG"
+COMMAND="/usr/sbin/$PROG"
 
 start() {
        [ -f $DEFAULT ] && . $DEFAULT
-       mkdir -p $RUN_D
-       $BIN $OPTIONS
+       service_start $COMMAND $OPTIONS
 }
 
 stop() {
-       [ -f $PID_F ] && kill -INT $(cat $PID_F)
+       service_stop $COMMAND
 }

diff --git a/admin/pmacct/files/pmacctd.init b/admin/pmacct/files/pmacctd.init
index a57c5817bf6830804a7536848e8c250648bfa467..3d75bcfa9394ac464a033e3dc345d51ec3ac9f07 100644 (file)
--- a/admin/pmacct/files/pmacctd.init
+++ b/admin/pmacct/files/pmacctd.init
@@ -1,18 +1,19 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
+
 START=50
 
-BIN=pmacctd
-DEFAULT=/etc/default/$BIN
-RUN_D=/var/run
-PID_F=$RUN_D/$BIN.pid
+SERVICE_USE_PID=1
+
+PROG="pmacctd"
+DEFAULT="/etc/default/$PROG"
+COMMAND="/usr/sbin/$PROG"
 
 start() {
        [ -f $DEFAULT ] && . $DEFAULT
-       mkdir -p $RUN_D
-       $BIN $OPTIONS
+       service_start $COMMAND $OPTIONS
 }
 
 stop() {
-       [ -f $PID_F ] && kill -INT $(cat $PID_F)
+       service_stop $COMMAND
 }

diff --git a/admin/pmacct/files/sfacctd.init b/admin/pmacct/files/sfacctd.init
index 0a2fd46627a8895c727b551555db1e2c6ba5d551..16468d478fcb9612a4e13dbfb6c0186e42ffe8e7 100644 (file)
--- a/admin/pmacct/files/sfacctd.init
+++ b/admin/pmacct/files/sfacctd.init
@@ -1,18 +1,19 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
+
 START=50
 
-BIN=sfacctd
-DEFAULT=/etc/default/$BIN
-RUN_D=/var/run
-PID_F=$RUN_D/$BIN.pid
+SERVICE_USE_PID=1
+
+PROG="sfacctd"
+DEFAULT="/etc/default/$PROG"
+COMMAND="/usr/sbin/$PROG"
 
 start() {
        [ -f $DEFAULT ] && . $DEFAULT
-       mkdir -p $RUN_D
-       $BIN $OPTIONS
+       service_start $COMMAND $OPTIONS
 }
 
 stop() {
-       [ -f $PID_F ] && kill -INT $(cat $PID_F)
+       service_stop $COMMAND
 }

diff --git a/admin/pmacct/files/uacctd.init b/admin/pmacct/files/uacctd.init
index a4239ad34c95f88bab9521988dd5378fcc57aaac..39b27baf361f2ef87ae9e2b9d486154b2dcda915 100644 (file)
--- a/admin/pmacct/files/uacctd.init
+++ b/admin/pmacct/files/uacctd.init
@@ -1,18 +1,19 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
+
 START=50
 
-BIN=uacctd
-DEFAULT=/etc/default/$BIN
-RUN_D=/var/run
-PID_F=$RUN_D/$BIN.pid
+SERVICE_USE_PID=1
+
+PROG="uacctd"
+DEFAULT="/etc/default/$PROG"
+COMMAND="/usr/sbin/$PROG"
 
 start() {
        [ -f $DEFAULT ] && . $DEFAULT
-       mkdir -p $RUN_D
-       $BIN $OPTIONS
+       service_start $COMMAND $OPTIONS
 }
 
 stop() {
-       [ -f $PID_F ] && kill -INT $(cat $PID_F)
+       service_stop $COMMAND
 }