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

[Sergey Popov (pinkbyte)]

pinkbyte    12/11/03 11:30:36

  Modified:             pmacctd-init.d
  Log:
  Improve initscript wrt bug #426956. Thanks to Jens Ott for patch
  
  (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, unsigned Manifest commit)

Revision  Changes    Path
1.7                  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.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/pmacct/files/pmacctd-init.d?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/pmacct/files/pmacctd-init.d?r1=1.6&r2=1.7

Index: pmacctd-init.d
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/files/pmacctd-init.d,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pmacctd-init.d	13 Apr 2012 15:54:38 -0000	1.6
+++ pmacctd-init.d	3 Nov 2012 11:30:36 -0000	1.7
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 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.6 2012/04/13 15:54:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/files/pmacctd-init.d,v 1.7 2012/11/03 11:30:36 pinkbyte Exp $
 
 PMACCTDDIR=${PMACCTDDIR:-/etc/pmacctd}
 if [ ${SVCNAME} != "pmacctd" ]; then
@@ -25,13 +25,13 @@
 start() {
 	checkconfig || return 1
 	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --pidfile "${PMACCTDPID}" --exec /usr/sbin/pmacctd \
+	start-stop-daemon --start --pidfile "${PMACCTDPID}" --exec /usr/sbin/"${SVCNAME}" \
 		-- -D -f "${PMACCTDCONF}" -F "${PMACCTDPID}" ${OPTS}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile "${PMACCTDPID}" --exec /usr/sbin/pmacctd
+	start-stop-daemon --stop --pidfile "${PMACCTDPID}" --exec /usr/sbin/"${SVCNAME}"
 	eend $?
 }