From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Sat, 2 Jun 2007 06:33:17 +0000 (+1000)
Subject: STATD_SHARED_DIRECTORY should be define din the nfs sysconfig file and
X-Git-Tag: tevent-0.9.20~348^2~2598^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5dc243ff9324a56313d51a2e5d8240ec93a0e563;p=thirdparty%2Fsamba.git

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 16fcbd98967..b9909f0c078 100644
--- 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 ef81864a798..25ed971e04d 100644
--- 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 c831bc6567f..6ba27306339 100644
--- 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 fd9a6a3f31a..5572c5d6f49 100755
--- 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