diff options
author | Jeroen Roovers <jer@gentoo.org> | 2014-04-12 23:19:56 +0000 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2014-04-12 23:19:56 +0000 |
commit | 0e863b9f3ab2c5f84dded5233831ff8c1c6d1f0e (patch) | |
tree | 55f8aa68ad3dee9229c916a968476f8c909586f8 | |
parent | vanilla-3.13.9 + genpatches-3.13-12 + grsecurity-3.0-3.13.9-201404111815 (diff) | |
download | historical-0e863b9f3ab2c5f84dded5233831ff8c1c6d1f0e.tar.gz historical-0e863b9f3ab2c5f84dded5233831ff8c1c6d1f0e.tar.bz2 historical-0e863b9f3ab2c5f84dded5233831ff8c1c6d1f0e.zip |
Replace PIDFILE here too.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613
-rw-r--r-- | net-analyzer/flow-tools/ChangeLog | 5 | ||||
-rw-r--r-- | net-analyzer/flow-tools/Manifest | 10 | ||||
-rwxr-xr-x | net-analyzer/flow-tools/files/flowcapture.initd | 4 |
3 files changed, 11 insertions, 8 deletions
diff --git a/net-analyzer/flow-tools/ChangeLog b/net-analyzer/flow-tools/ChangeLog index 68451392de67..918929e89184 100644 --- a/net-analyzer/flow-tools/ChangeLog +++ b/net-analyzer/flow-tools/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-analyzer/flow-tools # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.67 2014/04/12 20:03:43 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.68 2014/04/12 23:19:55 jer Exp $ + + 12 Apr 2014; Jeroen Roovers <jer@gentoo.org> files/flowcapture.initd: + Replace PIDFILE here too. 12 Apr 2014; Jeroen Roovers <jer@gentoo.org> files/flowcapture.confd, files/flowcapture.initd: diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest index 28d28db4e682..7d1abe05eee7 100644 --- a/net-analyzer/flow-tools/Manifest +++ b/net-analyzer/flow-tools/Manifest @@ -2,16 +2,16 @@ Hash: SHA256 AUX flowcapture.confd 1677 SHA256 b9398472e08fc93f4bffb542312bd494a90047177be29c8082fbdf2297c0c4bc SHA512 60285943879e48416b00e176de0ab2054623ecf83d49feb5bd88b5e68afea187013cbf889e7be3f26e8d2bdd96a2f19c482dab2815d14f4ab0e9d454aa27e3c1 WHIRLPOOL 2c3668088fc1d18c4ff7ba5229d2beb5bc3fbd20a4ffc6aae8cde5d193aff6fb3747844e426900ad8a23ad82c17b868dcf935f983e058dd22f00fe5f306578e4 -AUX flowcapture.initd 526 SHA256 140801046965d4b6091be6d435070539185982b784a6d7b7fada866d9e422bbd SHA512 d63023762bcb81a86c2b75690c8b23a8a289bc9b964a655a5088a5d942d0e83076c53894e992187c63d139388f896d99ca2ce924c83e503d22818a87a2112c72 WHIRLPOOL 98af3856ce3a1c7a778d03730605d7a99c9c2256c60f4c73c88c65bd4ecfeb82b3fd40eb8d653110b48621bea1c5127355b28274b854817d345ff006d6df89fc +AUX flowcapture.initd 558 SHA256 02ab64ec16194df5e5ee36f87a939a20d155f6c2a8924b96bf2239c3d5836959 SHA512 7b7977a47cd8b9a0f20c7eff4bbdd667f581ec35f0ba619723540afbdc7e922981bec54999a83347b5a587fe236662bebe3a919de25997842a5e43e20d2eeeb6 WHIRLPOOL 78fcb69421049a97bed6ea084cd70a7a840e7a8dc609904ef365ad2c1f19f1454b612333e68dad93dc4a1d46eb23f08b4fc4a68f4abb24b97a0c1d285199f13e AUX linkme 283 SHA256 93cef6b11cb25a9e91b529030e66cd4c709f382993335f2c7252de89c36735da SHA512 a9db8dec8b6f2a83b8896951bf1711ec7c58dd18d2da7db7015c0a000114b3d1da9bee4dd64842c074b332a06a890b2eea1b8ffc0399ce0efa39bf6527466359 WHIRLPOOL 94af50de39a8350d194917c129fdd5cdb542e07834340db0453a897185ccd4f4da6fd6584ecf144b79c5f8981c3dbfdd7e87894fa66bc230c530d2985828dba7 DIST flow-tools-0.68.5.1.tar.bz2 914062 SHA256 80bbd3791b59198f0d20184761d96ba500386b0a71ea613c214a50aa017a1f67 SHA512 ae17ba39854daa8ef3deecd3a554bb6d1fa47648cb791d8225a40bec13f65bf0692871660b2c3490d133b1251875c323d066bb0c0483eceb0707cec9b7714c57 WHIRLPOOL 2e7b98abab82ec07639356c07c89bb480276fec945c48ef86188a70a28ff54ab5dd1f1c7b69945d7b4e2687aafee06bef81dceea655b15aa735c50455723be83 EBUILD flow-tools-0.68.5.1-r2.ebuild 1840 SHA256 475a9d3780c476e21a5d629ec5b8101d914d86b08f6f1a5682ce5f036a702d05 SHA512 957d6b5ad16a2bbfe3425fa5dd31abd05a29b53af38de3bcdbbb3db5e4ca42a1ae8eddf3dc534594d92aefc2b4a55c011834b92c21f9593dcce80ec5d361a2c4 WHIRLPOOL 2321d1f3b1d3d465875c0032f9a21e9634c60ceec041d0f67d23a9c41452f02f1745a67455ca10996682052945c21945b10ef0f296f5c0421e9a158047e6d90c -MISC ChangeLog 12254 SHA256 e6f9e34c32c3fcba414a428f3400c0be10efa1516a4383a2b0203227d87444ae SHA512 2de5cb06b69c4238c34054abd063b0a3fb6865e9c8d25bfda68173a5fb8dcff2ca3e15f4bbf9c0b905e5f65dfd39ceee2828d8cd8c0b826d77e74c7d5092da32 WHIRLPOOL bbaf134fe08bfb8b6690878bdb0b2a1499bcc35e5cbbedf46e1ac99c7c0cbc9d7bbb81b9274ff0e08a65d454bb77a38909c5ca943f6e91a68f6d37504e819838 +MISC ChangeLog 12355 SHA256 0bd50e6449bcd1af31d302325da965543298e8a11da664f2cb047a9eef884916 SHA512 8ccd2e49714925938549dbef5f690a81c853e4bee2521439b1a5bbc1a3c8d7a1697d4dc68d85a00cf8f38cf72050fe07e7f769fce4745b42a1029d54dcfa6c60 WHIRLPOOL 96271b6dff58b0b7fa96f26dccb2794a19ff5e966c7e6c08773e9262f3081cf1ac31a3d8254fa39fd45d25327a4eeb983694785f1b5d604ed79b1a65c69a3a63 MISC metadata.xml 782 SHA256 96523568d0fc94af99564596f973f8207ca051a02fc4f2c248b4f416002aa50b SHA512 957f1c76b9439f5c72542691886eb728febe2fdd8bc0c524654987e84a3a007d9918d9d50aededd26f98ea00380947f8e6dd0b1da339c5235fa30d13ebd6163a WHIRLPOOL a52ba37b3f7f69a39ac39bc00ff8cba08b8bb67a533d567b441ebc647ae7acffadcbcb41e8ab271c477ddc59b3253096459e133b95309c1989e333e5251e14ac -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREIAAYFAlNJnCAACgkQVWmRsqeSphOVCQCfYfIEsag2LUOB+cYq6ciB1iBR -NesAn2UC25uYLSeLPAOYQdKSSQ0bF5zm -=tGl5 +iEYEAREIAAYFAlNJyhwACgkQVWmRsqeSphPLfACfceUB2i75f5jU3kkXuUt06tD4 +Se4AniFWCyYLc+s7EQR9GKrAMODKUktD +=gT72 -----END PGP SIGNATURE----- diff --git a/net-analyzer/flow-tools/files/flowcapture.initd b/net-analyzer/flow-tools/files/flowcapture.initd index 6c78f0fdf99d..54d581908093 100755 --- a/net-analyzer/flow-tools/files/flowcapture.initd +++ b/net-analyzer/flow-tools/files/flowcapture.initd @@ -10,7 +10,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} \ + --pidfile /run/flows/flowcapture.pid.${PORT} \ -- ${FLOW_OPTS} >/dev/null 2>&1 eend $? } @@ -18,6 +18,6 @@ start() { stop() { ebegin "Stopping flow-capture" start-stop-daemon --stop --quiet --exec /usr/bin/flow-capture \ - --pidfile ${PIDFILE}.${PORT} + --pidfile /run/flows/flowcapture.pid.${PORT} eend $? } |