[Pkg-samba-maint] r3284 - in branches/ctdb: . squeeze/debian

[sathieu at alioth.debian.org]

Author: sathieu
Date: 2010-02-10 18:19:27 +0000 (Wed, 10 Feb 2010)
New Revision: 3284

Added:
   branches/ctdb/squeeze/
Modified:
   branches/ctdb/squeeze/debian/changelog
   branches/ctdb/squeeze/debian/ctdb.init
Log:
* Back to 1.0.108 which works better with samba 3.4.x and 3.5.0
  (See <http://lists.alioth.debian.org/pipermail/pkg-samba-maint/
  2010-February/009100.html>)
* Cheery pick commits from 1.0.108-3 to 1.0.111-1
  - r3173: 07855ff5eba71e7d607d52e234a42553d9b93605 (Allow setting the recovery lock file as "", which means that we do not use a file and that we implicitely also disable the recovery lock checking.)
  - r3185: fix bashism
  - r3175, r3204: changelog



Modified: branches/ctdb/squeeze/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog	2009-12-13 19:56:47 UTC (rev 3152)
+++ branches/ctdb/squeeze/debian/changelog	2010-02-10 18:19:27 UTC (rev 3284)
@@ -1,3 +1,20 @@
+ctdb (1.0.111.really.1.0.108-1) UNRELEASED; urgency=low
+
+  * Back to 1.0.108 which works better with samba 3.4.x and 3.5.0
+    (See <http://lists.alioth.debian.org/pipermail/pkg-samba-maint/
+    2010-February/009100.html>)
+  * Cheery pick commits from 1.0.108-3 to 1.0.111-1
+
+ -- Mathieu Parent <sathieu at debian.org>  Wed, 10 Feb 2010 19:13:26 +0100
+
+ctdb (1.0.111-1) unstable; urgency=low
+
+  * New upstream release
+    - Refreshed patches
+    - Refreshed ctdb.init 
+
+ -- Mathieu Parent <sathieu at debian.org>  Mon, 04 Jan 2010 23:13:12 +0100
+
 ctdb (1.0.108-3) unstable; urgency=low
 
   * 05-hurd.diff updated: to make it build on GNU Hurd again.

Modified: branches/ctdb/squeeze/debian/ctdb.init
===================================================================
--- trunk/ctdb/debian/ctdb.init	2009-12-13 19:56:47 UTC (rev 3152)
+++ branches/ctdb/squeeze/debian/ctdb.init	2010-02-10 18:19:27 UTC (rev 3284)
@@ -124,10 +124,6 @@
 fi
 
 build_ctdb_options () {
-    [ -z "$CTDB_RECOVERY_LOCK" ] && {
-        echo "You must configure the location of the CTDB_RECOVERY_LOCK"
-        exit 1
-    }
 
     maybe_set () {
         # If the 2nd arg is null then return - don't set anything.
@@ -212,7 +208,7 @@
 
     check_persistent_databases || return $?
 
-    if [ yes == "$CTDB_SUPPRESS_COREFILE" ]; then
+    if [ yes = "$CTDB_SUPPRESS_COREFILE" ]; then
 	ulimit -c 0
     else
 	ulimit -c unlimited