Rev 528: merge from ronnie in http://samba.org/~tridge/ctdb

Sun Jun 10 23:43:23 GMT 2007

------------------------------------------------------------
revno: 528
revision-id: tridge at samba.org-20070610234323-6s6a8kxjx9ki9nwk
parent: tridge at samba.org-20070610072854-ztge8lpr11iz7o5n
parent: sahlberg at ronnie-20070610224251-wie16wf7b72zt27n
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Mon 2007-06-11 09:43:23 +1000
message:
  merge from ronnie
modified:
  config/events.d/10.interface   10.interface-20070604050809-s21zslfirn07zjt8-1
  doc/ctdb.1                     ctdb.1-20070609004027-2618fsab2br6vqha-1
  doc/ctdb.1.html                ctdb.1.html-20070609004024-w2r7qblwi5s3iw4a-1
    ------------------------------------------------------------
    revno: 432.1.75
    merged: sahlberg at ronnie-20070610224251-wie16wf7b72zt27n
    parent: sahlberg at ronnie-20070610223801-jjjt47y9h1weee6t
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Mon 2007-06-11 08:42:51 +1000
    message:
      when public interface is not set,  print this to the logfile before 
      exiting the script
    ------------------------------------------------------------
    revno: 432.1.74
    merged: sahlberg at ronnie-20070610223801-jjjt47y9h1weee6t
    parent: sahlberg at ronnie-20070610073152-dibldl71c7oiwyr1
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Mon 2007-06-11 08:38:01 +1000
    message:
      minor man page update
    ------------------------------------------------------------
    revno: 432.1.73
    merged: sahlberg at ronnie-20070610073152-dibldl71c7oiwyr1
    parent: sahlberg at ronnie-20070610044642-wktx698wu5ljb57q
    parent: tridge at samba.org-20070610072854-ztge8lpr11iz7o5n
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Sun 2007-06-10 17:31:52 +1000
    message:
      merge from tridge
=== modified file 'config/events.d/10.interface'

--- a/config/events.d/10.interface	2007-06-09 11:46:42 +0000
+++ b/config/events.d/10.interface	2007-06-10 23:43:23 +0000
@@ -8,11 +8,17 @@
 . /etc/ctdb/functions
 loadconfig ctdb
 
-[ -z "$CTDB_PUBLIC_INTERFACE" ] && exit 0
-
 cmd="$1"
 shift
 
+[ -z "$CTDB_PUBLIC_INTERFACE" ] && {
+    [ "$cmd" = "startup" ] && {
+	echo "Event script $0 : CTDB_PUBLIC_INTERFACE not set. Nothing to do."
+    }
+    exit 0
+}
+
+
 case $cmd in 
      #############################
      # called when ctdbd starts up

=== modified file 'doc/ctdb.1'
--- a/doc/ctdb.1	2007-06-10 04:46:42 +0000
+++ b/doc/ctdb.1	2007-06-10 22:38:01 +0000
@@ -1,11 +1,11 @@
 .\"     Title: ctdb
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.71.0 <http://docbook.sf.net/>
-.\"      Date: 06/10/2007
+.\"      Date: 06/11/2007
 .\"    Manual: 
 .\"    Source: 
 .\"
-.TH "CTDB" "1" "06/10/2007" "" ""
+.TH "CTDB" "1" "06/11/2007" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -19,7 +19,7 @@
 \fBctdb\fR [\-n\ <node>] [\-Y] [\-t\ <timeout>] [\-?\ \-\-help] [\-\-usage] [\-d\ \-\-debug=<INTEGER>] [\-\-socket=<filename>]
 .SH "DESCRIPTION"
 .PP
-ctdb is the utility to view and manage a ctdb cluster.
+ctdb is a utility to view and manage a ctdb cluster.
 .SH "OPTIONS"
 .PP
 \-n <node>

=== modified file 'doc/ctdb.1.html'
--- a/doc/ctdb.1.html	2007-06-10 04:46:42 +0000
+++ b/doc/ctdb.1.html	2007-06-10 22:38:01 +0000
@@ -1,5 +1,5 @@
 <html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>ctdb</title><meta name="generator" content="DocBook XSL Stylesheets V1.71.0"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en"><a name="ctdb.1"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>ctdb &#8212; clustered tdb database management utility</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">ctdb [ OPTIONS ] COMMAND ...</code> </p></div><div class="cmdsynopsis"><p><code class="command">ctdb</code>  [-n &lt;node&gt;] [-Y] [-t &lt;timeout&gt;] [-? --help] [--usage] [-d --debug=&lt;INTEGER&gt;] [--socket=&lt;filename&gt;]</p></div></div><div class="refsect1" lang="en"><a name="id2478591"></a><h2>DESCRIPTION</h2><p>
-      ctdb is the utility to view and manage a ctdb cluster.
+      ctdb is a utility to view and manage a ctdb cluster.
     </p></div><div class="refsect1" lang="en"><a name="id2478600"></a><h2>OPTIONS</h2><div class="variablelist"><dl><dt><span class="term">-n &lt;node&gt;</span></dt><dd><p>
             This specifies on which node to execute the command. Default is
             to run the command on the deamon running on the local host.

