From: Martin Schwenke <martin@meltin.net>
Date: Wed, 29 Jun 2016 07:05:17 +0000 (+1000)
Subject: ctdb-scripts: Drop optional argument to nfs_check_services()
X-Git-Tag: tdb-1.3.10~490
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa5b6f6e9f5b1d4b238b0b721c065bcf4261a8a1;p=thirdparty%2Fsamba.git

ctdb-scripts: Drop optional argument to nfs_check_services()

Added so that nfs_check_services() could be run against an arbirary
directory.  However, with the function moved to the event script, this
isn't useful.  CTDB_NFS_CHECKS_DIR can be used for testing instead.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/config/events.d/60.nfs b/ctdb/config/events.d/60.nfs
index eb12ad6ac4c..07b4edf732d 100755
--- a/ctdb/config/events.d/60.nfs
+++ b/ctdb/config/events.d/60.nfs
@@ -25,12 +25,12 @@ service_reconfigure ()
 ######################################################
 # Check the health of NFS services
 #
-# Use .check files in given directory.
+# Use .check files in $CTDB_NFS_CHECKS_DIR.
 # Default is "${CTDB_BASE}/nfs-checks.d/"
 ######################################################
 nfs_check_services ()
 {
-    _dir="${1:-${CTDB_NFS_CHECKS_DIR:-${CTDB_BASE}/nfs-checks.d}}"
+    _dir="${CTDB_NFS_CHECKS_DIR:-${CTDB_BASE}/nfs-checks.d}"
 
     # Files must end with .check - avoids editor backups, RPM fu, ...
     for _f in "$_dir"/[0-9][0-9].*.check ; do