summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Krier <cedk@gentoo.org>2007-03-28 21:17:57 +0000
committerCédric Krier <cedk@gentoo.org>2007-03-28 21:17:57 +0000
commitd47368ab1b97fa519c7e8b91de69e41036eeaf4a (patch)
tree4dcaf0be4aedf73ba1bbdb5731b4e08fc976c357 /net-analyzer/pmacct/files
parentia64 stable wrt bug 168106 (diff)
downloadgentoo-2-d47368ab1b97fa519c7e8b91de69e41036eeaf4a.tar.gz
gentoo-2-d47368ab1b97fa519c7e8b91de69e41036eeaf4a.tar.bz2
gentoo-2-d47368ab1b97fa519c7e8b91de69e41036eeaf4a.zip
net-analyzer/pmacct: Improve init script for bug #172281
(Portage version: 2.1.2.2)
Diffstat (limited to 'net-analyzer/pmacct/files')
-rw-r--r--net-analyzer/pmacct/files/pmacctd-conf.d5
-rw-r--r--net-analyzer/pmacct/files/pmacctd-init.d11
2 files changed, 4 insertions, 12 deletions
diff --git a/net-analyzer/pmacct/files/pmacctd-conf.d b/net-analyzer/pmacct/files/pmacctd-conf.d
index bf68484c872d..b360d5d5a97f 100644
--- a/net-analyzer/pmacct/files/pmacctd-conf.d
+++ b/net-analyzer/pmacct/files/pmacctd-conf.d
@@ -1,9 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/files/pmacctd-conf.d,v 1.2 2004/07/14 23:08:10 agriffis Exp $
-
-# Interface to listen on
-INTERFACE="eth0"
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/files/pmacctd-conf.d,v 1.3 2007/03/28 21:17:57 cedk Exp $
# Other options to pass to pmacctd
#OPTS=""
diff --git a/net-analyzer/pmacct/files/pmacctd-init.d b/net-analyzer/pmacct/files/pmacctd-init.d
index 7e04273c7f32..e24b097c1767 100644
--- a/net-analyzer/pmacct/files/pmacctd-init.d
+++ b/net-analyzer/pmacct/files/pmacctd-init.d
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2004 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.2 2004/07/14 23:08:10 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/files/pmacctd-init.d,v 1.3 2007/03/28 21:17:57 cedk Exp $
depend() {
need net
@@ -18,13 +18,8 @@ start() {
chekconfig || return 1
ebegin "Starting pmacctd"
start-stop-daemon --start --exec /usr/sbin/pmacctd \
- -- -D -f /etc/pmacctd.conf -i ${INTERFACE} ${OPTS}
-
- # pmacctd apparently always returns a value > 0 when launched,
- # and start-stop-daemon sees that an error an therfore always
- # return 1. So we have to assume everything whent as expected.
-
- eend
+ -- -D -f /etc/pmacctd.conf ${OPTS}
+ eend $?
}
stop() {