Set $CTDB_VARDIR in the functions file.

This will be needed when eventscripts that use it are called
externally.

Signed-off-by: Martin Schwenke <martin@meltin.net>

diff --git a/config/ctdb.init b/config/ctdb.init
index 1dc051c7d3e68508f14908099d1ca7b5c5ba6dbc..5092cb33983c2f0c12e6bf0f77183e1b5a345901 100755 (executable)
--- a/config/ctdb.init
+++ b/config/ctdb.init
@@ -39,10 +39,6 @@ unset TMPDIR
     export CTDB_BASE="/etc/ctdb"
 }
 
-[ -z "$CTDB_VARDIR" ] && {
-    export CTDB_VARDIR="/var/ctdb"
-}
-
 . $CTDB_BASE/functions
 loadconfig network
 loadconfig ctdb

diff --git a/config/functions b/config/functions
index 6c44fb8d871e9abcd7819de575d4b442fd416125..06442d01b7a15d874478ff03efc34d201a3d4a80 100755 (executable)
--- a/config/functions
+++ b/config/functions
@@ -2,6 +2,10 @@
 
 PATH=/bin:/usr/bin:/usr/sbin:/sbin:$PATH
 
+[ -z "$CTDB_VARDIR" ] && {
+    export CTDB_VARDIR="/var/ctdb"
+}
+
 #######################################
 # pull in a system config file, if any
 _loadconfig() {

diff --git a/config/statd-callout b/config/statd-callout
index 39be9d3d4a1f085fb37b018163b0492a5faaaa20..9f63154f06f918285304316b09abba90b6e6a5a3 100755 (executable)
--- a/config/statd-callout
+++ b/config/statd-callout
@@ -9,10 +9,6 @@
     export CTDB_BASE="/etc/ctdb"
 }
 
-[ -z "$CTDB_VARDIR" ] && {
-    export CTDB_VARDIR="/var/ctdb"
-}
-
 . $CTDB_BASE/functions
 loadconfig ctdb
 loadconfig nfs