[gentoo-commits] gentoo-x86 commit in net-analyzer/pmacct/files: pmacctd-init.d

[Jeroen Roovers (jer)]

jer         10/09/30 16:43:05

  Modified:             pmacctd-init.d
  Log:
  Version bump thanks to Marcin Mirosław (bug #339229). Change init.d script to allow multiple instances by Marcin Mirosław (bug #306837).
  
  (Portage version: 2.2_rc86/cvs/Linux i686)

Revision  Changes    Path
1.5                  net-analyzer/pmacct/files/pmacctd-init.d

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/pmacct/files/pmacctd-init.d?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/pmacct/files/pmacctd-init.d?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/pmacct/files/pmacctd-init.d?r1=1.4&r2=1.5

Index: pmacctd-init.d
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/files/pmacctd-init.d,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pmacctd-init.d	1 Jun 2009 09:48:41 -0000	1.4
+++ pmacctd-init.d	30 Sep 2010 16:43:05 -0000	1.5
@@ -1,29 +1,37 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/files/pmacctd-init.d,v 1.4 2009/06/01 09:48:41 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/files/pmacctd-init.d,v 1.5 2010/09/30 16:43:05 jer Exp $
+
+PMACCTDDIR=${PMACCTDDIR:-/etc/pmacct}
+if [ ${SVCNAME} != "pmacctd" ]; then
+	PMACCTDPID="/var/run/${SVCNAME}.pid"
+else
+	PMACCTDPID="/var/run/pmacctd.pid"
+fi
+PMACCTDCONF="${PMACCTDDIR}/${SVCNAME}.conf"
 
 depend() {
 	need net
 }
 
 checkconfig() {
-	if [ ! -e /etc/pmacctd.conf ] ; then
-		eerror "You need an /etc/pmacctd.conf file to run pmacctd"
+	if [ ! -e ${PMACCTDCONF} ] ; then
+		eerror "You need an ${PMACCTDCONF} file to run pmacctd"
 		return 1
 	fi
 }
 
 start() {
 	checkconfig || return 1
-	ebegin "Starting pmacctd"
-	start-stop-daemon --start --pidfile /var/run/pmacctd.pid --exec /usr/sbin/pmacctd \
-		-- -D -f /etc/pmacctd.conf -F /var/run/pmacctd.pid ${OPTS}
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --pidfile "${PMACCTDPID}" --exec /usr/sbin/pmacctd \
+		-- -D -f "${PMACCTDCONF}" -F "${PMACCTDPID}" ${OPTS}
 	eend $?
 }
 
 stop() {
-	ebegin "Stopping pmacctd"
-	start-stop-daemon --stop --pidfile /var/run/pmacctd.pid --exec /usr/sbin/pmacctd
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --pidfile "${PMACCTDPID}" --exec /usr/sbin/pmacctd
 	eend $?
 }