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 8eefd031a79a990303fa10d2f280904e317c8821..d9d71da39a2f27bc7c39dbca1712b0aa515fcb2e 100755 (executable)
--- 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 593ca4c697cff015b768b9c75bde654a05b2c2e3..6c4b5a239f65e931c2661f1d140e43f3a2cfe860 100644 (file)
--- 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"