Gentoo Archives: gentoo-commits

From: Sven Wegener <swegener@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/conntrack-tools/files/
Date: Mon, 11 Sep 2017 05:09:59
Message-Id: 1505106519.16e9bf9d9784c088dc70a3219ca1fe445e52ca12.swegener@gentoo
1 commit: 16e9bf9d9784c088dc70a3219ca1fe445e52ca12
2 Author: Sven Wegener <swegener <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 11 05:00:37 2017 +0000
4 Commit: Sven Wegener <swegener <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 11 05:08:39 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16e9bf9d
7
8 net-firewall/conntrack-tools: Fix module check in init script
9
10 Drop -e option from sysctl, because we explicitly want to know about
11 unknown keys. Also not printing values is needless, if we need to
12 redirect the key name anyway. And the order of the redirections needs to
13 be the other way round.
14
15 Package-Manager: Portage-2.3.6, Repoman-2.3.3
16
17 net-firewall/conntrack-tools/files/conntrackd.initd-r3 | 4 ++--
18 1 file changed, 2 insertions(+), 2 deletions(-)
19
20 diff --git a/net-firewall/conntrack-tools/files/conntrackd.initd-r3 b/net-firewall/conntrack-tools/files/conntrackd.initd-r3
21 index 180a07bcbf5..eddcae97ec3 100644
22 --- a/net-firewall/conntrack-tools/files/conntrackd.initd-r3
23 +++ b/net-firewall/conntrack-tools/files/conntrackd.initd-r3
24 @@ -1,5 +1,5 @@
25 #!/sbin/openrc-run
26 -# Copyright 1999-2013 Gentoo Foundation
27 +# Copyright 1999-2017 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29
30 CONNTRACKD_BIN="/usr/sbin/conntrackd"
31 @@ -17,7 +17,7 @@ checkconfig() {
32 for k in net.netfilter.nf_conntrack_max \
33 net.ipv4.netfilter.ip_conntrack_max \
34 net.nf_conntrack_max; do
35 - if sysctl -e -n ${k} 2>&1 > /dev/null; then
36 + if sysctl ${k} >/dev/null 2>&1; then
37 nf_ct_available=1 # sysctl key found
38 break
39 fi