summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2012-03-21 07:52:49 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2012-03-21 07:52:49 +0000
commit8a738c4278cac20334cbf332b16356a5626b788f (patch)
treed677fec16f4f0d3858d8e8ad6bcc489db86bf36a /net-analyzer/softflowd/files
parentBump (diff)
downloadgentoo-2-8a738c4278cac20334cbf332b16356a5626b788f.tar.gz
gentoo-2-8a738c4278cac20334cbf332b16356a5626b788f.tar.bz2
gentoo-2-8a738c4278cac20334cbf332b16356a5626b788f.zip
Make it easier to pass an explicit index for the interface.
(Portage version: 2.2.0_alpha93/cvs/Linux x86_64)
Diffstat (limited to 'net-analyzer/softflowd/files')
-rw-r--r--net-analyzer/softflowd/files/softflowd.confd1
-rw-r--r--net-analyzer/softflowd/files/softflowd.initd8
2 files changed, 6 insertions, 3 deletions
diff --git a/net-analyzer/softflowd/files/softflowd.confd b/net-analyzer/softflowd/files/softflowd.confd
index 125de16a3875..0ece5c04b481 100644
--- a/net-analyzer/softflowd/files/softflowd.confd
+++ b/net-analyzer/softflowd/files/softflowd.confd
@@ -4,3 +4,4 @@
# SOFTFLOWD_TIMEOUTS="maxlife=600"
# SOFTFLOWD_MAXFLOWS=17000
# SOFTFLOWD_EXTRA=
+# SOFTFLOWD_INTERFACE_IDX=
diff --git a/net-analyzer/softflowd/files/softflowd.initd b/net-analyzer/softflowd/files/softflowd.initd
index 0b72bdcbfdf3..e02169763d5f 100644
--- a/net-analyzer/softflowd/files/softflowd.initd
+++ b/net-analyzer/softflowd/files/softflowd.initd
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2011 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/softflowd/files/softflowd.initd,v 1.1 2011/10/12 19:57:02 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/softflowd/files/softflowd.initd,v 1.2 2012/03/21 07:52:49 robbat2 Exp $
depend() {
need net
@@ -30,9 +30,11 @@ start() {
softflowd_checkconfig || return 1
ebegin "Starting softflowd on interface ${SOFTFLOWD_INTERFACE}"
+ iface_arg=${SOFTFLOWD_INTERFACE}
+ [ -n "${SOFTFLOWD_INTERFACE_IDX}" ] && iface_arg="${SOFTFLOWD_INTERFACE_IDX}:${iface_arg}"
start-stop-daemon --start \
--exec /usr/sbin/softflowd \
- -- -i "${SOFTFLOWD_INTERFACE}" \
+ -- -i "${iface_arg}" \
-n "${SOFTFLOWD_COLLECTOR}" \
-p "${SOFTFLOWD_PIDFILE}" \
-c "${SOFTFLOWD_CTLFILE}" \