[SCM] CTDB repository - branch master updated - ctdb-1.0.59-2-gdc9cd47

[Ronnie Sahlberg]

The branch, master has been updated
       via  dc9cd4779db4a89697731e4cf415be51067a07c1 (commit)
       via  07dd4c7d2e8ba10f53d4cf2644fc4b7b8647e286 (commit)
      from  dc108adada33bb713f71a2859eda3b439ed0cd1a (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit dc9cd4779db4a89697731e4cf415be51067a07c1
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Mon Oct 13 08:27:33 2008 +1100

    from Mathieu Parent <math.parent at gmail.com>
    Hi,
    
    I have attached a patch necessary as debian log dir (/var/log) is not
    a subdir of VARDIR (/var/lib on rpm systems, /var/lib/ctdb on debian).
    As I don't know much about autotools and friends, this patch may be
    hacky.
    
    This is part of the process to minimize diff between distributions.

commit 07dd4c7d2e8ba10f53d4cf2644fc4b7b8647e286
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Mon Oct 13 08:21:20 2008 +1100

    From Mathieu Parent
    patch to make debian systems log the package versions in
    ctdb_diagnostics

-----------------------------------------------------------------------

Summary of changes:
 Makefile.in            |    5 +++--
 server/ctdbd.c         |    2 +-
 tools/ctdb_diagnostics |    5 +++++
 3 files changed, 9 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/Makefile.in b/Makefile.in
index cf1240b..e51fec9 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,6 +12,7 @@ bindir = @bindir@
 sbindir = @sbindir@
 mandir = @mandir@
 localstatedir = @localstatedir@
+logdir = @logdir@
 VPATH = @srcdir@:@tdbdir@:@tallocdir@:@libreplacedir@:@poptdir@
 srcdir = @srcdir@
 etcdir = @sysconfdir@
@@ -29,8 +30,8 @@ IPQ_LIBS = @IPQ_LIBS@
 
 CFLAGS=-g -I$(srcdir)/include -Iinclude -Ilib -Ilib/util -I$(srcdir) \
        -I at tallocdir@ -I at tdbdir@/include -I at libreplacedir@ \
-	-DVARDIR=\"$(localstatedir)\" -DETCDIR=\"$(etcdir)\" \
-	-DUSE_MMAP=1 @CFLAGS@ $(POPT_CFLAGS)
+	-DVARDIR=\"$(localstatedir)\" -DLOGDIR=\"$(logdir)\" \
+	-DETCDIR=\"$(etcdir)\" -DUSE_MMAP=1 @CFLAGS@ $(POPT_CFLAGS)
 
 LIB_FLAGS=@LDFLAGS@ -Llib @LIBS@ $(POPT_LIBS) @INFINIBAND_LIBS@ @CTDB_PCAP_LDFLAGS@
 
diff --git a/server/ctdbd.c b/server/ctdbd.c
index 4dc0f74..48e361f 100644
--- a/server/ctdbd.c
+++ b/server/ctdbd.c
@@ -50,7 +50,7 @@ static struct {
 	.nlist = ETCDIR "/ctdb/nodes",
 	.transport = "tcp",
 	.event_script_dir = ETCDIR "/ctdb/events.d",
-	.logfile = VARDIR "/log/log.ctdb",
+	.logfile = LOGDIR "/log.ctdb",
 	.db_dir = VARDIR "/ctdb",
 	.db_dir_persistent = VARDIR "/ctdb/persistent",
 };
diff --git a/tools/ctdb_diagnostics b/tools/ctdb_diagnostics
index 437580f..4415a90 100755
--- a/tools/ctdb_diagnostics
+++ b/tools/ctdb_diagnostics
@@ -93,6 +93,11 @@ show_all "uname -a"
 [ -x /bin/rpm ] && {
     show_all "rpm -qa | egrep 'samba|ctdb|gpfs'"
 }
+[ -x /usr/bin/dpkg-query ] && {
+    show_all "/usr/bin/dpkg-query --show 'ctdb'"
+    show_all "/usr/bin/dpkg-query --show 'samba'"
+    #show_all "/usr/bin/dpkg-query --show 'gpfs'"
+}
 
 
 cat <<EOF


-- 
CTDB repository