[Pkg-samba-maint] r2945 - trunk/ctdb/debian

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2009-07-13 19:26:07 +0000 (Mon, 13 Jul 2009)
New Revision: 2945

Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/ctdb.init
Log:
  * new upstream release 1.0.86
    - update ctdb.init:
      + allow starting without a reclock file



Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog	2009-07-13 19:17:51 UTC (rev 2944)
+++ trunk/ctdb/debian/changelog	2009-07-13 19:26:07 UTC (rev 2945)
@@ -1,9 +1,12 @@
-ctdb (1.0.85-2) UNRELEASED; urgency=low
+ctdb (1.0.86-1) UNRELEASED; urgency=low
 
+  * new upstream release
+    - update ctdb.init:
+      + allow starting without a reclock file
   * 30_outdated-autotools.diff: Correct outdated config.{sub,guess}
     (Closes: #536256)
 
- -- Mathieu Parent <math.parent at gmail.com>  Mon, 13 Jul 2009 21:04:50 +0200
+ -- Mathieu Parent <math.parent at gmail.com>  Mon, 13 Jul 2009 21:23:58 +0200
 
 ctdb (1.0.85-1) unstable; urgency=low
 

Modified: trunk/ctdb/debian/ctdb.init
===================================================================
--- trunk/ctdb/debian/ctdb.init	2009-07-13 19:17:51 UTC (rev 2944)
+++ trunk/ctdb/debian/ctdb.init	2009-07-13 19:26:07 UTC (rev 2945)
@@ -114,12 +114,11 @@
 [ "${NETWORKING}" = "no" ] && exit 0
 
 [ -z "$CTDB_RECOVERY_LOCK" ] && {
-    echo "You must configure the location of the CTDB_RECOVERY_LOCK"
-    exit 1
+    echo "No recovery lock specified. Starting CTDB without split brain prevention"
 }
-CTDB_OPTIONS="$CTDB_OPTIONS --reclock=$CTDB_RECOVERY_LOCK"
 
 # build up CTDB_OPTIONS variable from optional parameters
+[ -z "$CTDB_RECOVERY_LOCK" ]    || CTDB_OPTIONS="$CTDB_OPTIONS --reclock=$CTDB_RECOVERY_LOCK"
 [ -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"