- make more options configurable

- fixed some warnings

(This used to be ctdb commit e08bb371827b14a80a131ce8e83145cd468e7e1f)

diff --git a/ctdb/direct/ctdbd_test.c b/ctdb/direct/ctdbd_test.c
index 1df52d08361d2f046df484434df1a9b299c258c0..b9dfa886b2c78e36c53ab11cbe94569ca773a4bc 100644 (file)
--- a/ctdb/direct/ctdbd_test.c
+++ b/ctdb/direct/ctdbd_test.c
@@ -228,7 +228,7 @@ void fetch_record(int fd, uint32_t db_id, TDB_DATA key)
 
 int main(int argc, const char *argv[])
 {
-       int fd, pid, vnn, dstvnn, dstpid;
+       int fd, pid=0, vnn, dstvnn, dstpid;
        TDB_DATA message;
        struct ctdb_req_message *reply;
        TDB_DATA dbname;

diff --git a/ctdb/packaging/RHEL/ctdb.spec b/ctdb/packaging/RHEL/ctdb.spec
index e12de6a31938f481d5ec4e3f785d44eb406dce51..78baec4a6f14da2a4b0d5be23c39efeef7ddb1f0 100644 (file)
--- a/ctdb/packaging/RHEL/ctdb.spec
+++ b/ctdb/packaging/RHEL/ctdb.spec
@@ -72,6 +72,7 @@ find $RPM_BUILD_ROOT -name "*.old" -exec rm -f {} \;
 rm -rf $RPM_BUILD_ROOT
 
 %post
+/sbin/chkconfig --add ctdb
 
 %preun
 if [ $1 = 0 ] ; then

diff --git a/ctdb/packaging/RHEL/setup/ctdb.init b/ctdb/packaging/RHEL/setup/ctdb.init
index 0686fd4f39518826c2728ce5508f3172e15a0363..e34107e6b30f907f9c4202685573ba4e2053e23d 100755 (executable)
--- a/ctdb/packaging/RHEL/setup/ctdb.init
+++ b/ctdb/packaging/RHEL/setup/ctdb.init
@@ -20,6 +20,8 @@ unset TMPDIR
 # Source networking configuration.
 . /etc/sysconfig/network
 
+CTDB_OPTIONS=""
+
 # pull in admin specified config 
 if [ -f /etc/sysconfig/ctdb ]; then
    . /etc/sysconfig/ctdb 
@@ -29,12 +31,14 @@ fi
 [ ${NETWORKING} = "no" ] && exit 0
 
 # build up CTDB_OPTIONS variable
-CTDB_OPTIONS=""
 [ -z "$LOGFILE" ]          || CTDB_OPTIONS="$CTDB_OPTIONS --logfile=$LOGFILE"
-[ -z "$PUBLIC_ADDRESSES" ] || CTDB_OPTIONS="$CTDB_OPTIONS --public-addresses=$PUBLIC_ADDRESSES"
 [ -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"
 
 start() {

diff --git a/ctdb/packaging/RHEL/setup/ctdb.sysconfig b/ctdb/packaging/RHEL/setup/ctdb.sysconfig
index 4f7fd72bc0f25b4584e12b2746ad90625ddb56c3..b0b61e0dec1e8b9445c26f074309a38fe6e3a190 100644 (file)
--- a/ctdb/packaging/RHEL/setup/ctdb.sysconfig
+++ b/ctdb/packaging/RHEL/setup/ctdb.sysconfig
@@ -2,7 +2,14 @@
 
 # DBDIR=/var/ctdb
 # NODES=/etc/ctdb/nodes
+# EVENT_SCRIPT=/etc/ctdb/events
+# CTDB_SOCKET=/tmp/ctdb.socket
+# TRANSPORT="tcp"
 # PUBLIC_ADDRESSES=/etc/ctdb/public_addresses
 # PUBLIC_INTERFACE=eth0
 # LOGFILE=/var/log/log.ctdb
 # DEBUGLEVEL=0
+
+# any other options
+# CTDB_OPTIONS=
+

diff --git a/ctdb/tools/ctdb_control.c b/ctdb/tools/ctdb_control.c
index 8deb55bf639610a7bcd8547ce07077a86aef0e7a..8ea92fccf69b3460c247044dffe5d6baddc6dfa3 100644 (file)
--- a/ctdb/tools/ctdb_control.c
+++ b/ctdb/tools/ctdb_control.c
@@ -737,7 +737,7 @@ int main(int argc, const char *argv[])
        int opt;
        const char **extra_argv;
        int extra_argc = 0;
-       int ret, i;
+       int ret=-1, i;
        poptContext pc;
        struct event_context *ev;
        const char *control;