From 121d1a8571a36636ba6efda778d01ec8c9d1e671 Mon Sep 17 00:00:00 2001
From: Martin Schwenke <martin@meltin.net>
Date: Mon, 17 Aug 2015 14:12:15 +1000
Subject: [PATCH] ctdb-scripts: Rename variable CTDB_ETCDIR to CTDB_SYS_ETCDIR

This variable points to /etc/ by default.

This distinguishes it from the different variable from wscript, which
points to /etc/ctdb/.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Jose A. Rivera <jarrpa@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
---
 ctdb/config/events.d/13.per_ip_routing        |  2 +-
 ctdb/config/functions                         | 20 +++++++++----------
 ctdb/doc/ctdbd.conf.5.xml                     |  2 +-
 .../eventscripts/50.samba.monitor.110.sh      |  2 +-
 .../eventscripts/50.samba.monitor.111.sh      |  2 +-
 ctdb/tests/eventscripts/scripts/local.sh      |  8 ++++----
 ctdb/tests/eventscripts/stubs/testparm        |  4 ++--
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/ctdb/config/events.d/13.per_ip_routing b/ctdb/config/events.d/13.per_ip_routing
index 60c1dd08edd..56dfc348df4 100755
--- a/ctdb/config/events.d/13.per_ip_routing
+++ b/ctdb/config/events.d/13.per_ip_routing
@@ -95,7 +95,7 @@ ipv4_host_addr_to_net ()
 
 ensure_rt_tables ()
 {
-    rt_tables="$CTDB_ETCDIR/iproute2/rt_tables"
+    rt_tables="$CTDB_SYS_ETCDIR/iproute2/rt_tables"
 
     # This file should always exist.  Even if this didn't exist on the
     # system, adding a route will have created it.  What if we startup
diff --git a/ctdb/config/functions b/ctdb/config/functions
index 85d062cf201..994c638a5bb 100755
--- a/ctdb/config/functions
+++ b/ctdb/config/functions
@@ -15,8 +15,8 @@ if [ -z "$CTDB_SCRIPT_VARDIR" ] ; then
     CTDB_SCRIPT_VARDIR="/usr/local/var/lib/ctdb/state"
 fi
 
-if [ -z "$CTDB_ETCDIR" ] ; then
-    CTDB_ETCDIR="/etc"
+if [ -z "$CTDB_SYS_ETCDIR" ] ; then
+    CTDB_SYS_ETCDIR="/etc"
 fi
 
 #######################################
@@ -39,10 +39,10 @@ _loadconfig() {
 	return
     fi
 
-    if [ -f $CTDB_ETCDIR/sysconfig/$1 ]; then
-	. $CTDB_ETCDIR/sysconfig/$1
-    elif [ -f $CTDB_ETCDIR/default/$1 ]; then
-	. $CTDB_ETCDIR/default/$1
+    if [ -f $CTDB_SYS_ETCDIR/sysconfig/$1 ]; then
+	. $CTDB_SYS_ETCDIR/sysconfig/$1
+    elif [ -f $CTDB_SYS_ETCDIR/default/$1 ]; then
+	. $CTDB_SYS_ETCDIR/default/$1
     elif [ -f $CTDB_BASE/sysconfig/$1 ]; then
 	. $CTDB_BASE/sysconfig/$1
     fi
@@ -183,10 +183,10 @@ _service ()
       $_nice /sbin/service "$_service_name" "$_op"
   elif [ -x /usr/sbin/service ]; then
       $_nice /usr/sbin/service "$_service_name" "$_op"
-  elif [ -x $CTDB_ETCDIR/init.d/$_service_name ]; then
-      $_nice $CTDB_ETCDIR/init.d/$_service_name "$_op"
-  elif [ -x $CTDB_ETCDIR/rc.d/init.d/$_service_name ]; then
-      $_nice $CTDB_ETCDIR/rc.d/init.d/$_service_name "$_op"
+  elif [ -x $CTDB_SYS_ETCDIR/init.d/$_service_name ]; then
+      $_nice $CTDB_SYS_ETCDIR/init.d/$_service_name "$_op"
+  elif [ -x $CTDB_SYS_ETCDIR/rc.d/init.d/$_service_name ]; then
+      $_nice $CTDB_SYS_ETCDIR/rc.d/init.d/$_service_name "$_op"
   fi
 }
 
diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml
index 57835e442be..082af0c1503 100644
--- a/ctdb/doc/ctdbd.conf.5.xml
+++ b/ctdb/doc/ctdbd.conf.5.xml
@@ -1498,7 +1498,7 @@ CTDB_SET_MonitorInterval=20
       </varlistentry>
 
       <varlistentry>
-	<term>CTDB_ETCDIR=<parameter>DIRECTORY</parameter></term>
+	<term>CTDB_SYS_ETCDIR=<parameter>DIRECTORY</parameter></term>
 	<listitem>
 	  <para>
 	    DIRECTORY containing system configuration files.  This is
diff --git a/ctdb/tests/eventscripts/50.samba.monitor.110.sh b/ctdb/tests/eventscripts/50.samba.monitor.110.sh
index 21519335674..83a2271f268 100755
--- a/ctdb/tests/eventscripts/50.samba.monitor.110.sh
+++ b/ctdb/tests/eventscripts/50.samba.monitor.110.sh
@@ -9,7 +9,7 @@ setup_samba
 export FAKE_TESTPARM_FAIL="yes"
 required_result 1 <<EOF
 ERROR: smb.conf cache create failed - testparm failed with:
-Load smb config files from ${CTDB_ETCDIR}/samba/smb.conf
+Load smb config files from ${CTDB_SYS_ETCDIR}/samba/smb.conf
 rlimit_max: increasing rlimit_max (2048) to minimum Windows limit (16384)
 Processing section "[1_existing]"
 Processing section "[2_existing]"
diff --git a/ctdb/tests/eventscripts/50.samba.monitor.111.sh b/ctdb/tests/eventscripts/50.samba.monitor.111.sh
index 53f2f67cfb9..034e0128b59 100755
--- a/ctdb/tests/eventscripts/50.samba.monitor.111.sh
+++ b/ctdb/tests/eventscripts/50.samba.monitor.111.sh
@@ -12,7 +12,7 @@ simple_test
 export FAKE_TESTPARM_FAIL="yes"
 required_result 1 <<EOF
 WARNING: smb.conf cache update failed - using old cache file
-Load smb config files from ${CTDB_ETCDIR}/samba/smb.conf
+Load smb config files from ${CTDB_SYS_ETCDIR}/samba/smb.conf
 rlimit_max: increasing rlimit_max (2048) to minimum Windows limit (16384)
 Processing section "[1_existing]"
 Processing section "[2_existing]"
diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index bed602a8813..1edb9a433b0 100644
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -33,9 +33,9 @@ touch "${CTDB_LOGGING#file:}" || \
 
 if [ -d "${TEST_SUBDIR}/etc" ] ; then
     cp -a "${TEST_SUBDIR}/etc" "$EVENTSCRIPTS_TESTS_VAR_DIR"
-    export CTDB_ETCDIR="${EVENTSCRIPTS_TESTS_VAR_DIR}/etc"
+    export CTDB_SYS_ETCDIR="${EVENTSCRIPTS_TESTS_VAR_DIR}/etc"
 else
-    die "Unable to setup \$CTDB_ETCDIR"
+    die "Unable to setup \$CTDB_SYS_ETCDIR"
 fi
 
 if [ -d "${TEST_SUBDIR}/etc-ctdb" ] ; then
@@ -881,7 +881,7 @@ rpc_services_up ()
 
 nfs_load_config ()
 {
-    _etc="$CTDB_ETCDIR" # shortcut for readability
+    _etc="$CTDB_SYS_ETCDIR" # shortcut for readability
     for _c in "$_etc/sysconfig/nfs" "$_etc/default/nfs" "$_etc/ctdb/sysconfig/nfs" ; do
 	if [ -r "$_c" ] ; then
 	    . "$_c"
@@ -1166,7 +1166,7 @@ simple_test ()
 
 ##################################################
 CTDB_BASE="$CTDB_BASE"
-CTDB_ETCDIR="$CTDB_ETCDIR"
+CTDB_SYS_ETCDIR="$CTDB_SYS_ETCDIR"
 ctdb client is "$(which ctdb)"
 ip command is "$(which ip)"
 EOF
diff --git a/ctdb/tests/eventscripts/stubs/testparm b/ctdb/tests/eventscripts/stubs/testparm
index 692db45a49d..0473bbf4ea2 100755
--- a/ctdb/tests/eventscripts/stubs/testparm
+++ b/ctdb/tests/eventscripts/stubs/testparm
@@ -9,7 +9,7 @@ not_implemented ()
 error ()
 {
     cat >&2 <<EOF
-Load smb config files from ${CTDB_ETCDIR}/samba/smb.conf
+Load smb config files from ${CTDB_SYS_ETCDIR}/samba/smb.conf
 rlimit_max: increasing rlimit_max (2048) to minimum Windows limit (16384)
 EOF
 
@@ -68,7 +68,7 @@ if [ -n "$file" ] ; then
     cat "$file"
 else
     # We force our own smb.conf and add the shares.
-    cat "${CTDB_ETCDIR}/samba/smb.conf"
+    cat "${CTDB_SYS_ETCDIR}/samba/smb.conf"
 
     for i in $FAKE_SHARES ; do
 	bi=$(basename "$i")
-- 
2.34.1