diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2016-07-28 17:45:27 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2016-07-28 17:45:44 -0700 |
| commit | a3508c8b9bced6ce2ae49816022b85e2dcd9af2e (patch) | |
| tree | 9561e0731f7ded54b3e90ffedf63bc051318d11a /net-analyzer/flow-tools/files | |
| parent | games-action/xbomber: add a blocker for sci-biology/emboss #589918 (diff) | |
| download | gentoo-a3508c8b9bced6ce2ae49816022b85e2dcd9af2e.tar.gz gentoo-a3508c8b9bced6ce2ae49816022b85e2dcd9af2e.tar.bz2 gentoo-a3508c8b9bced6ce2ae49816022b85e2dcd9af2e.zip | |
net-analyzer/flow-tools: get to the bottom of the weird pidfile behavior in the codebase, -p is not the full path!.
Package-Manager: portage-2.2.28
Diffstat (limited to 'net-analyzer/flow-tools/files')
| -rw-r--r-- | net-analyzer/flow-tools/files/flowcapture.confd | 9 | ||||
| -rw-r--r-- | net-analyzer/flow-tools/files/flowcapture.initd | 6 |
2 files changed, 11 insertions, 4 deletions
diff --git a/net-analyzer/flow-tools/files/flowcapture.confd b/net-analyzer/flow-tools/files/flowcapture.confd index 20a238584d0f..e926d64a8eec 100644 --- a/net-analyzer/flow-tools/files/flowcapture.confd +++ b/net-analyzer/flow-tools/files/flowcapture.confd @@ -39,10 +39,13 @@ WORKDIR=/var/lib/flows/ft # user to run as USER=flows -# Pidfile -PIDFILE=/run/flows/flowcapture.pid.${PORT} +# Pidfile base +# The daemon takes the pidfile argument and APPENDS .$PORT itself in writing. +# It may have multiple children by original design, but this is not recommended +# for Gentoo at this time. +PIDFILE_BASE=${PIDFILE_BASE:=/run/flows/flowcapture.pid} # This pulls in the options above -FLOW_OPTS="-p $PIDFILE -w $WORKDIR $LOCALIP/$REMOTEIP/$PORT -V $FLOW_VER -E $SIZE -n $ROTATIONS -N $NEST -R $ROTATE_PROG" +FLOW_OPTS="-p $PIDFILE_BASE -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.$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 e03d493ee10d..a31ed5ebea29 100644 --- a/net-analyzer/flow-tools/files/flowcapture.initd +++ b/net-analyzer/flow-tools/files/flowcapture.initd @@ -3,7 +3,11 @@ # Distributed under the terms of the GNU General Public License v2 PORT=${PORT:=2055} -PIDFILE=${PIDFILE:=/run/flows/flowcapture.pid.${PORT}} +# The daemon takes the pidfile argument and APPENDS .$PORT itself in writing. +# It may have multiple children by original design, but this is not recommended +# for Gentoo at this time. +PIDFILE_BASE=${PIDFILE_BASE:=/run/flows/flowcapture.pid} +PIDFILE=${PIDFILE:=${PIDFILE}.${PORT}} depend() { use net |