From: Martin Schwenke <martin@meltin.net>
Date: Mon, 20 Aug 2018 03:38:25 +0000 (+1000)
Subject: ctdb-doc: Make config migration script notice removed CTDB_BASE option
X-Git-Tag: tdb-1.3.17~2031
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4afb60a24b932a0b7a0c2f27526f41d0bf38fc2;p=thirdparty%2Fsamba.git

ctdb-doc: Make config migration script notice removed CTDB_BASE option

This should never have been a user-level option, but some people used
it.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13589

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

diff --git a/ctdb/doc/examples/config_migrate.sh b/ctdb/doc/examples/config_migrate.sh
index 8eefd031a79..d9d71da39a2 100755
--- a/ctdb/doc/examples/config_migrate.sh
+++ b/ctdb/doc/examples/config_migrate.sh
@@ -155,6 +155,7 @@ check_removed_option ()
 	_option="$1"
 
 	grep -Fqx "$_option" <<EOF
+CTDB_BASE
 CTDB_PIDFILE
 CTDB_SOCKET
 CTDB_EVENT_SCRIPT_DIR
diff --git a/ctdb/doc/examples/config_migrate.test_input b/ctdb/doc/examples/config_migrate.test_input
index 593ca4c697c..6c4b5a239f6 100644
--- a/ctdb/doc/examples/config_migrate.test_input
+++ b/ctdb/doc/examples/config_migrate.test_input
@@ -1,3 +1,5 @@
+CTDB_BASE="/etc/ctdb"
+
 CTDB_RECOVERY_LOCK="/some/place/on/shared/storage"
 
 CTDB_NODES="/etc/ctdb/nodes"