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

[sathieu at alioth.debian.org]

Author: sathieu
Date: 2009-10-14 16:33:18 +0000 (Wed, 14 Oct 2009)
New Revision: 3089

Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/ctdb.init
Log:
  * New upstream release
  * ctdb.init: ported 'move the logging of the warning "No reclock file used"
    to the startup case so we only print this warning on "service ctdb start"
    and not for "service ctdb *"' from upstream
    (commit eb854f65f978f24583e221138eb4f9b917b89285)


Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog	2009-10-11 15:20:24 UTC (rev 3088)
+++ trunk/ctdb/debian/changelog	2009-10-14 16:33:18 UTC (rev 3089)
@@ -1,3 +1,13 @@
+ctdb (1.0.96-1) unstable; urgency=low
+
+  * New upstream release
+  * ctdb.init: ported 'move the logging of the warning "No reclock file used"
+    to the startup case so we only print this warning on "service ctdb start"
+    and not for "service ctdb *"' from upstream
+    (commit eb854f65f978f24583e221138eb4f9b917b89285)
+
+ -- Mathieu Parent <sathieu at debian.org>  Wed, 14 Oct 2009 18:30:38 +0200
+
 ctdb (1.0.92-1) unstable; urgency=low
 
   * New upstream release, patches integrated :

Modified: trunk/ctdb/debian/ctdb.init
===================================================================
--- trunk/ctdb/debian/ctdb.init	2009-10-11 15:20:24 UTC (rev 3088)
+++ trunk/ctdb/debian/ctdb.init	2009-10-14 16:33:18 UTC (rev 3089)
@@ -107,10 +107,6 @@
 
 set -e
 
-[ -z "$CTDB_RECOVERY_LOCK" ] && {
-    echo "No recovery lock specified. Starting CTDB without split brain prevention"
-}
-
 # check networking is up (for redhat)
 [ "$NETWORKING" = "no" ] && exit 0
 
@@ -153,6 +149,9 @@
         CTDB_OPTIONS="${CTDB_OPTIONS}${CTDB_OPTIONS:+ }${1}${sep}${val}"
     }
 
+    [ -z "$CTDB_RECOVERY_LOCK" ] && {
+        echo "No recovery lock specified. Starting CTDB without split brain prevention"
+    }
     maybe_set "--reclock"                "$CTDB_RECOVERY_LOCK"
 
     # build up CTDB_OPTIONS variable from optional parameters