jer 14/04/12 20:03:43 Modified: flowcapture.initd flowcapture.confd Log: Use checkpath instead of keepdir, hard-code PIDFILE as it is not a useful configuration option (bug #483590 by Reuben Farrelly). (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.4 net-analyzer/flow-tools/files/flowcapture.initd file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/flow-tools/files/flowcapture.initd?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/flow-tools/files/flowcapture.initd?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/flow-tools/files/flowcapture.initd?r1=1.3&r2=1.4 Index: flowcapture.initd =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/files/flowcapture.initd,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- flowcapture.initd 26 Feb 2013 15:23:03 -0000 1.3 +++ flowcapture.initd 12 Apr 2014 20:03:43 -0000 1.4 @@ -1,5 +1,5 @@ #!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 depend() { @@ -8,6 +8,7 @@ start() { ebegin "Starting flow-capture" + checkpath -d -o flows /run/flows start-stop-daemon --start --user ${USER} --exec /usr/bin/flow-capture \ --pidfile ${PIDFILE}.${PORT} \ -- ${FLOW_OPTS} >/dev/null 2>&1 1.4 net-analyzer/flow-tools/files/flowcapture.confd file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/flow-tools/files/flowcapture.confd?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/flow-tools/files/flowcapture.confd?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/flow-tools/files/flowcapture.confd?r1=1.3&r2=1.4 Index: flowcapture.confd =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/files/flowcapture.confd,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- flowcapture.confd 26 Dec 2012 03:30:02 -0000 1.3 +++ flowcapture.confd 12 Apr 2014 20:03:43 -0000 1.4 @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # Config file for /etc/init.d/flowcap @@ -11,9 +11,6 @@ # You probably don't want to change this, but in case you do - nest level NEST=0 -# pid file location -PIDFILE=/var/run/flowcapture.pid - # port to listen on PORT=2055 @@ -43,6 +40,6 @@ USER=flows # 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 /run/flows/flowcapture.pid -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 $PIDFILE -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 -w $WORKDIR $LOCALIP/$REMOTEIP/$PORT -S $STAT_INT -V $FLOW_VER -E $SIZE -n $ROTATIONS -N $NEST -R $ROTATE_PROG"
