diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2016-07-27 15:51:52 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2016-07-27 15:52:02 -0700 |
| commit | 223fb8e53d2e97688e3be0313ec0d49b46483b1a (patch) | |
| tree | 35be93500540037b4f6c9d1d3be6028ad24dfa0a /net-analyzer/flow-tools/files | |
| parent | app-portage/repoman: 2.3.0-r1 revbump with patch for bug 586864 (diff) | |
| download | gentoo-223fb8e53d2e97688e3be0313ec0d49b46483b1a.tar.gz gentoo-223fb8e53d2e97688e3be0313ec0d49b46483b1a.tar.bz2 gentoo-223fb8e53d2e97688e3be0313ec0d49b46483b1a.zip | |
net-analyzer/flow-tools: fix pidfile port suffix to match in both confd and initd.
Package-Manager: portage-2.2.28
Diffstat (limited to 'net-analyzer/flow-tools/files')
| -rw-r--r-- | net-analyzer/flow-tools/files/flowcapture.confd | 7 | ||||
| -rw-r--r-- | net-analyzer/flow-tools/files/flowcapture.initd | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/net-analyzer/flow-tools/files/flowcapture.confd b/net-analyzer/flow-tools/files/flowcapture.confd index 82ce38a4bc73..20a238584d0f 100644 --- a/net-analyzer/flow-tools/files/flowcapture.confd +++ b/net-analyzer/flow-tools/files/flowcapture.confd @@ -39,7 +39,10 @@ WORKDIR=/var/lib/flows/ft # user to run as USER=flows +# Pidfile +PIDFILE=/run/flows/flowcapture.pid.${PORT} + # This pulls in the options above -FLOW_OPTS="-p /run/flows/flowcapture.pid -w $WORKDIR $LOCALIP/$REMOTEIP/$PORT -V $FLOW_VER -E $SIZE -n $ROTATIONS -N $NEST -R $ROTATE_PROG" +FLOW_OPTS="-p $PIDFILE -w $WORKDIR $LOCALIP/$REMOTEIP/$PORT -V $FLOW_VER -E $SIZE -n $ROTATIONS -N $NEST -R $ROTATE_PROG" # Use below only if you have sorted out the STAT_INT problem -#FLOW_OPTS="-p /run/flows/flowcapture.pid -w $WORKDIR $LOCALIP/$REMOTEIP/$PORT -S $STAT_INT -V $FLOW_VER -E $SIZE -n $ROTATIONS -N $NEST -R $ROTATE_PROG" +#FLOW_OPTS="-p /run/flows/flowcapture.pid.$PORT -w $WORKDIR $LOCALIP/$REMOTEIP/$PORT -S $STAT_INT -V $FLOW_VER -E $SIZE -n $ROTATIONS -N $NEST -R $ROTATE_PROG" diff --git a/net-analyzer/flow-tools/files/flowcapture.initd b/net-analyzer/flow-tools/files/flowcapture.initd index a1c32ea99b71..e03d493ee10d 100644 --- a/net-analyzer/flow-tools/files/flowcapture.initd +++ b/net-analyzer/flow-tools/files/flowcapture.initd @@ -2,6 +2,9 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +PORT=${PORT:=2055} +PIDFILE=${PIDFILE:=/run/flows/flowcapture.pid.${PORT}} + depend() { use net } @@ -10,7 +13,7 @@ start() { ebegin "Starting flow-capture" checkpath -d -o flows /run/flows start-stop-daemon --start --user ${USER} --exec /usr/bin/flow-capture \ - --pidfile /run/flows/flowcapture.pid.${PORT} \ + --pidfile ${PIDFILE} \ -- ${FLOW_OPTS} >/dev/null 2>&1 eend $? } @@ -18,6 +21,6 @@ start() { stop() { ebegin "Stopping flow-capture" start-stop-daemon --stop --quiet --exec /usr/bin/flow-capture \ - --pidfile /run/flows/flowcapture.pid.${PORT} + --pidfile ${PIDFILE} eend $? } |