make sure we don't have any namespace collision problems with config variables

(This used to be ctdb commit dde9024b25fe12cf25c059e5accb3ca21838b130)

diff --git a/ctdb/config/ctdb.init b/ctdb/config/ctdb.init
index 8b61bee34378ca494e7223ce66b840e97be3bfd3..61591cc0831258df043c5c1b486019e648eba0fc 100755 (executable)
--- a/ctdb/config/ctdb.init
+++ b/ctdb/config/ctdb.init
@@ -50,15 +50,15 @@ CTDB_OPTIONS=""
 CTDB_OPTIONS="$CTDB_OPTIONS --reclock=$CTDB_RECOVERY_LOCK"
 
 # build up CTDB_OPTIONS variable from optional parameters
-[ -z "$LOGFILE" ]          || CTDB_OPTIONS="$CTDB_OPTIONS --logfile=$LOGFILE"
-[ -z "$NODES" ]            || CTDB_OPTIONS="$CTDB_OPTIONS --nlist=$NODES"
-[ -z "$CTDB_SOCKET" ]      || CTDB_OPTIONS="$CTDB_OPTIONS --socket=$CTDB_SOCKET"
-[ -z "$PUBLIC_ADDRESSES" ] || CTDB_OPTIONS="$CTDB_OPTIONS --public-addresses=$PUBLIC_ADDRESSES"
-[ -z "$PUBLIC_INTERFACE" ] || CTDB_OPTIONS="$CTDB_OPTIONS --public-interface=$PUBLIC_INTERFACE"
-[ -z "$DBDIR" ]            || CTDB_OPTIONS="$CTDB_OPTIONS --dbdir=$DBDIR"
-[ -z "$EVENT_SCRIPT" ]     || CTDB_OPTIONS="$CTDB_OPTIONS --event-script $EVENT_SCRIPT"
-[ -z "$TRANSPORT" ]        || CTDB_OPTIONS="$CTDB_OPTIONS --transport $TRANSPORT"
-[ -z "$DEBUGLEVEL" ]       || CTDB_OPTIONS="$CTDB_OPTIONS -d $DEBUGLEVEL"
+[ -z "$CTDB_LOGFILE" ]          || CTDB_OPTIONS="$CTDB_OPTIONS --logfile=$CTDB_LOGFILE"
+[ -z "$CTDB_NODES" ]            || CTDB_OPTIONS="$CTDB_OPTIONS --nlist=$CTDB_NODES"
+[ -z "$CTDB_SOCKET" ]           || CTDB_OPTIONS="$CTDB_OPTIONS --socket=$CTDB_SOCKET"
+[ -z "$CTDB_PUBLIC_ADDRESSES" ] || CTDB_OPTIONS="$CTDB_OPTIONS --public-addresses=$CTDB_PUBLIC_ADDRESSES"
+[ -z "$CTDB_PUBLIC_INTERFACE" ] || CTDB_OPTIONS="$CTDB_OPTIONS --public-interface=$CTDB_PUBLIC_INTERFACE"
+[ -z "$CTDB_DBDIR" ]            || CTDB_OPTIONS="$CTDB_OPTIONS --dbdir=$CTDB_DBDIR"
+[ -z "$CTDB_EVENT_SCRIPT" ]     || CTDB_OPTIONS="$CTDB_OPTIONS --event-script $CTDB_EVENT_SCRIPT"
+[ -z "$CTDB_TRANSPORT" ]        || CTDB_OPTIONS="$CTDB_OPTIONS --transport $CTDB_TRANSPORT"
+[ -z "$CTDB_DEBUGLEVEL" ]       || CTDB_OPTIONS="$CTDB_OPTIONS -d $CTDB_DEBUGLEVEL"
 
 if [ -x /sbin/startproc ]; then
     init_style="suse"

diff --git a/ctdb/config/ctdb.sysconfig b/ctdb/config/ctdb.sysconfig
index 91ff955ad8be5d8890c7f0d3cc348de0e3b9504e..6b1091d95790e4828032ccf0c11b20225576cccd 100644 (file)
--- a/ctdb/config/ctdb.sysconfig
+++ b/ctdb/config/ctdb.sysconfig
@@ -9,12 +9,12 @@
 # containing the list of public IP addresses that ctdb will manage
 # Note that these IPs must be different from those in $NODES above
 # there is no default
-# PUBLIC_ADDRESSES=/etc/ctdb/public_addresses
+# CTDB_PUBLIC_ADDRESSES=/etc/ctdb/public_addresses
 
 # when doing IP takeover you also must specify what network interface
 # to use for the public addresses
 # there is no default
-# PUBLIC_INTERFACE=eth0
+# CTDB_PUBLIC_INTERFACE=eth0
 
 # should ctdb manage starting/stopping the Samba service for you?
 # default is to not manage Samba
@@ -24,16 +24,16 @@
 # it should contain a list of IPs that ctdb will use
 # it must be exactly the same on all cluster nodes
 # defaults to /etc/ctdb/nodes
-# NODES=/etc/ctdb/nodes
+# CTDB_NODES=/etc/ctdb/nodes
 
 # the directory to put the local ctdb database files in
 # defaults to /var/ctdb
-# DBDIR=/var/ctdb
+# CTDB_DBDIR=/var/ctdb
 
 # the script to run when ctdb needs to ask the OS for help,
 # such as when a IP address needs to be taken or released
 # defaults to /etc/ctdb/events
-# EVENT_SCRIPT=/etc/ctdb/events
+# CTDB_EVENT_SCRIPT=/etc/ctdb/events
 
 # the location of the local ctdb socket
 # defaults to /tmp/ctdb.socket
@@ -41,15 +41,15 @@
 
 # what transport to use. Only tcp is currently supported
 # defaults to tcp
-# TRANSPORT="tcp"
+# CTDB_TRANSPORT="tcp"
 
 # where to log messages
 # the default is /var/log/log.ctdb
-# LOGFILE=/var/log/log.ctdb
+# CTDB_LOGFILE=/var/log/log.ctdb
 
 # what debug level to run at. Higher means more verbose
 # the default is 0
-# DEBUGLEVEL=0
+# CTDB_DEBUGLEVEL=0
 
 # any other options you might want. Run ctdbd --help for a list
 # CTDB_OPTIONS=