From: Sven Wegener <swegener@gentoo.org>
Date: Mon, 11 Sep 2017 05:00:37 +0000 (+0000)
Subject: net-firewall/conntrack-tools: Fix module check in init script
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=16e9bf9d9784c088dc70a3219ca1fe445e52ca12;p=gentoo.git

net-firewall/conntrack-tools: Fix module check in init script

Drop -e option from sysctl, because we explicitly want to know about
unknown keys. Also not printing values is needless, if we need to
redirect the key name anyway. And the order of the redirections needs to
be the other way round.

Package-Manager: Portage-2.3.6, Repoman-2.3.3
---

diff --git a/net-firewall/conntrack-tools/files/conntrackd.initd-r3 b/net-firewall/conntrack-tools/files/conntrackd.initd-r3
index 180a07bcbf55..eddcae97ec3d 100644
--- a/net-firewall/conntrack-tools/files/conntrackd.initd-r3
+++ b/net-firewall/conntrack-tools/files/conntrackd.initd-r3
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 CONNTRACKD_BIN="/usr/sbin/conntrackd"
@@ -17,7 +17,7 @@ checkconfig() {
 	for k in net.netfilter.nf_conntrack_max \
 		net.ipv4.netfilter.ip_conntrack_max \
 		net.nf_conntrack_max; do
-		if sysctl -e -n ${k} 2>&1 > /dev/null; then
+		if sysctl ${k} >/dev/null 2>&1; then
 			nf_ct_available=1 # sysctl key found
 			break
 		fi