]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
ctdb-scripts: Fix tcp_tw_recycle existence check
authorRafael David Tinoco via samba-technical <samba-technical@lists.samba.org>
Mon, 3 Jun 2019 02:44:15 +0000 (23:44 -0300)
committerKarolin Seeger <kseeger@samba.org>
Fri, 21 Jun 2019 07:56:21 +0000 (07:56 +0000)
net.ipv4.tcp_tw_recycle has been removed from Linux 4.12 but, still,
makes sense to check its existence. Unfortunately, current check does
not test for the procfs file existence. This commit fixes the issue.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13984

Signed-off-by: Rafael David Tinoco <rafaeldtinoco@ubuntu.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Tue Jun  4 23:31:24 UTC 2019 on sn-devel-184

(cherry picked from commit 843fbb1207ee7ac84f3282974b66b9290d8da0ac)

ctdb/config/nfs-linux-kernel-callout

index 3d1dc63c59047d189d5637fc958f1e236eef39fc..12ed17c6d9e4ab360eab3e25d98841f1dc658cca 100755 (executable)
@@ -281,8 +281,8 @@ nfs_startup ()
     basic_stop "nfs" || true
     basic_start "nfs"
     _f="${PROCFS_PATH}/sys/net/ipv4/tcp_tw_recycle"
-    if [ "$_f" ] ; then
-       echo 1 >"$_f"
+    if [ -f "$_f" ] ; then
+           echo 1 >"$_f"
     fi
 }