From: Martin Schwenke <martin@meltin.net>
Date: Mon, 30 Apr 2018 10:26:20 +0000 (+1000)
Subject: ctdb-scripts: Fix location of persistent databases
X-Git-Tag: ldb-1.4.0~474
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=051203e1f80c1365e8f72fc3e819e6dda3aac4f2;p=thirdparty%2Fsamba.git

ctdb-scripts: Fix location of persistent databases

If CTDB_DBDIR_PERSISTENT is not set then set the default relative to
CTDB_VARDIR.  The persistent database directory is not (necessarily)
relative to the volatile one.

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

diff --git a/ctdb/config/events.d/00.ctdb b/ctdb/config/events.d/00.ctdb
index 532f78b5132..272dcb1ba35 100755
--- a/ctdb/config/events.d/00.ctdb
+++ b/ctdb/config/events.d/00.ctdb
@@ -65,7 +65,7 @@ check_tdb ()
 
 check_persistent_databases ()
 {
-    _dir="${CTDB_DBDIR_PERSISTENT:-${CTDB_DBDIR:-${CTDB_VARDIR}}/persistent}"
+    _dir="${CTDB_DBDIR_PERSISTENT:-${CTDB_VARDIR}/persistent}"
     [ -d "$_dir" ] || return 0
 
     [ "${CTDB_MAX_PERSISTENT_CHECK_ERRORS:-0}" = "0" ] || return 0