summaryrefslogtreecommitdiff
path: root/ctdb/doc
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2018-08-20 13:38:25 +1000
committerAmitay Isaacs <amitay@samba.org>2018-08-24 10:59:20 +0200
commitd4afb60a24b932a0b7a0c2f27526f41d0bf38fc2 (patch)
tree3425398f540f6ae38f898c37d832e12ef2de9c34 /ctdb/doc
parent48335725deecdbdb24a9176cf31e9611c9deda49 (diff)
downloadsamba-d4afb60a24b932a0b7a0c2f27526f41d0bf38fc2.tar.gz
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>
Diffstat (limited to 'ctdb/doc')
-rwxr-xr-xctdb/doc/examples/config_migrate.sh1
-rw-r--r--ctdb/doc/examples/config_migrate.test_input2
2 files changed, 3 insertions, 0 deletions
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"