From: Martin Schwenke <martin@meltin.net>
Date: Thu, 5 Apr 2018 06:09:22 +0000 (+1000)
Subject: ctdb-scripts: Drop CTDB_RC_LOCAL testing hook
X-Git-Tag: ldb-1.4.0~520
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=110e72ccd8e241cb8bed7e257ee9d96767fd9e24;p=thirdparty%2Fsamba.git

ctdb-scripts: Drop CTDB_RC_LOCAL testing hook

This is not used.

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

Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Fri Apr 27 09:37:49 CEST 2018 on sn-devel-144
---

diff --git a/ctdb/config/functions b/ctdb/config/functions
index 8728d99129b..020a19a7c3f 100755
--- a/ctdb/config/functions
+++ b/ctdb/config/functions
@@ -986,10 +986,6 @@ update_tickles ()
 # load a site local config file
 ########################################################
 
-[ -n "$CTDB_RC_LOCAL" -a -x "$CTDB_RC_LOCAL" ] && {
-	. "$CTDB_RC_LOCAL"
-}
-
 [ -x "${CTDB_BASE}/rc.local" ] && {
 	. "${CTDB_BASE}/rc.local"
 }
diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml
index b454b572904..f0f903b81c0 100644
--- a/ctdb/doc/ctdbd.conf.5.xml
+++ b/ctdb/doc/ctdbd.conf.5.xml
@@ -1516,22 +1516,6 @@ CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=9000
 	</listitem>
       </varlistentry>
 
-      <varlistentry>
-	<term>CTDB_RC_LOCAL=<parameter>FILENAME</parameter></term>
-	<listitem>
-	  <para>
-	    FILENAME is a script fragment to be sourced by the
-	    <filename>functions</filename> that is sourced by scripts.
-	    On example use would be to override function definitions
-	    in unit tests.  As a sanity check, this file must be
-	    executable for it to be used.
-	  </para>
-	  <para>
-	    No default.
-	  </para>
-	</listitem>
-      </varlistentry>
-
       <varlistentry>
 	<term>CTDB_RUN_TIMEOUT_MONITOR=yes|no</term>
 	<listitem>