* [gentoo-commits] gentoo-x86 commit in net-analyzer/pmacct/files: pmacctd-init.d
@ 2010-09-30 16:43 Jeroen Roovers (jer)
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers (jer) @ 2010-09-30 16:43 UTC (permalink / raw
To: gentoo-commits
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 $?
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-analyzer/pmacct/files: pmacctd-init.d
@ 2012-04-13 15:54 Jeroen Roovers (jer)
0 siblings, 0 replies; 3+ messages in thread
From: Jeroen Roovers (jer) @ 2012-04-13 15:54 UTC (permalink / raw
To: gentoo-commits
jer 12/04/13 15:54:38
Modified: pmacctd-init.d
Log:
Fix run time configuration directory.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Revision Changes Path
1.6 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.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/pmacct/files/pmacctd-init.d?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/pmacct/files/pmacctd-init.d?r1=1.5&r2=1.6
Index: pmacctd-init.d
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/files/pmacctd-init.d,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pmacctd-init.d 30 Sep 2010 16:43:05 -0000 1.5
+++ pmacctd-init.d 13 Apr 2012 15:54:38 -0000 1.6
@@ -1,9 +1,9 @@
#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# 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.5 2010/09/30 16:43:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/files/pmacctd-init.d,v 1.6 2012/04/13 15:54:38 jer Exp $
-PMACCTDDIR=${PMACCTDDIR:-/etc/pmacct}
+PMACCTDDIR=${PMACCTDDIR:-/etc/pmacctd}
if [ ${SVCNAME} != "pmacctd" ]; then
PMACCTDPID="/var/run/${SVCNAME}.pid"
else
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-analyzer/pmacct/files: pmacctd-init.d
@ 2012-11-03 11:30 Sergey Popov (pinkbyte)
0 siblings, 0 replies; 3+ messages in thread
From: Sergey Popov (pinkbyte) @ 2012-11-03 11:30 UTC (permalink / raw
To: gentoo-commits
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 $?
}
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-11-03 11:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-30 16:43 [gentoo-commits] gentoo-x86 commit in net-analyzer/pmacct/files: pmacctd-init.d Jeroen Roovers (jer)
-- strict thread matches above, loose matches on Subject: below --
2012-04-13 15:54 Jeroen Roovers (jer)
2012-11-03 11:30 Sergey Popov (pinkbyte)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox