summaryrefslogtreecommitdiff
path: root/ctdb
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2019-03-20 21:22:43 +1100
committerKarolin Seeger <kseeger@samba.org>2019-04-12 07:57:11 +0000
commit49fa08814e2a1032e88353eec42b952316d6ec18 (patch)
treee92676a90842fa0d879330f70825ed91f1b77abd /ctdb
parentdae0e8ec961dc96e2d75c9b5e7d1c47479a9c1e4 (diff)
downloadsamba-49fa08814e2a1032e88353eec42b952316d6ec18.tar.gz
ctdb-scripts: Update statd-callout to try several configuration files
The alternative seems to be to try something via CTDB_NFS_CALLOUT. That would be complicated and seems like overkill for something this simple. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13860 Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@samba.org> (cherry picked from commit a2bd4085896804ee2da811e17f18c78a5bf4e658)
Diffstat (limited to 'ctdb')
-rwxr-xr-xctdb/config/statd-callout3
1 files changed, 2 insertions, 1 deletions
diff --git a/ctdb/config/statd-callout b/ctdb/config/statd-callout
index bf18b5586b3..b75135bbde5 100755
--- a/ctdb/config/statd-callout
+++ b/ctdb/config/statd-callout
@@ -20,7 +20,8 @@ die ()
exit 1
}
-load_system_config "nfs"
+# Try different variables to find config file for NFS_HOSTNAME
+load_system_config "nfs" "nfs-common"
[ -n "$NFS_HOSTNAME" ] || \
die "NFS_HOSTNAME is not configured. statd-callout failed"