STATD_SHARED_DIRECTORY should be define din the nfs sysconfig file and

not the ctdb sysconfig file since this variable has nothing at all to do
with ctdb

(This used to be ctdb commit d17073b7da5ecba1b93a5ed4fbdf86bf052fdc90)

diff --git a/ctdb/tools/ctdb.sysconfig b/ctdb/tools/ctdb.sysconfig
index 16fcbd98967a8c3d8e51c43eed4bfc0deaf0f41c..b9909f0c078d7e5c77770d2e0532715d1d6f8377 100644 (file)
--- a/ctdb/tools/ctdb.sysconfig
+++ b/ctdb/tools/ctdb.sysconfig
@@ -48,11 +48,6 @@
 # the default is 0
 # DEBUGLEVEL=0
 
-# the shared directory where you want to put statd information on
-# which clients to notify on a NFS restart
-# there is no default
-# STATD_SHARED_DIRECTORY="/some/shared/directory"
-
 # any other options you might want. Run ctdbd --help for a list
 # CTDB_OPTIONS=
 

diff --git a/ctdb/tools/events.d/nfs b/ctdb/tools/events.d/nfs
index ef81864a7980dc81a89f62ab974d7e46d33d13b9..25ed971e04daf7347e25bc9272a58923dd16dde4 100644 (file)
--- a/ctdb/tools/events.d/nfs
+++ b/ctdb/tools/events.d/nfs
@@ -1,7 +1,7 @@
 #!/bin/sh
 # script to manage nfs in a clustered environment
 
-. /etc/sysconfig/ctdb
+. /etc/sysconfig/nfs
 . /etc/ctdb/functions
 
 cmd="$1"

diff --git a/ctdb/tools/events.d/nfslock b/ctdb/tools/events.d/nfslock
index c831bc6567fd0c5f3a9395d637d5c6b5ef785270..6ba2730633987dfe2dfe43b2e753fd31e9c4604c 100644 (file)
--- a/ctdb/tools/events.d/nfslock
+++ b/ctdb/tools/events.d/nfslock
@@ -1,7 +1,7 @@
 #!/bin/sh
 # event strict to manage lockd and statd in a cluster environment
 
-. /etc/sysconfig/ctdb
+. /etc/sysconfig/nfs
 . /etc/ctdb/functions
 
 cmd="$1"

diff --git a/ctdb/tools/statd-callout b/ctdb/tools/statd-callout
index fd9a6a3f31a89f60bfc1fa9332bdcba43a0d0fb4..5572c5d6f494493ead5bf6af1bc3921f99373e4e 100755 (executable)
--- a/ctdb/tools/statd-callout
+++ b/ctdb/tools/statd-callout
@@ -3,7 +3,7 @@
 # this script needs to be installed so that statd points to it with the -H 
 # command line argument. The easiest way to do that is 
 
-. /etc/sysconfig/ctdb
+. /etc/sysconfig/nfs
 
 [ -z "$STATD_SHARED_DIRECTORY" ] && exit 0