From: Evan Broder <broder@mit.edu>
Date: Wed, 27 Jan 2010 02:19:32 +0000 (-0500)
Subject: In invirt-cluster-config:
X-Git-Tag: 0.0.12~1
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-cluster-config.git/commitdiff_plain/d0f4c32fa89f3f0b1cb407ac2a562b26dfb6c94a?hp=fb1a8eb94268b61918560e8424b7284ea8bd34e6

In invirt-cluster-config:
  * Use LVM's built-in cluster locking instead of a separate locking
    library - this is the behavior prefered by modern LVM.

svn path=/trunk/packages/invirt-cluster-config/; revision=2926
---

diff --git a/debian/changelog b/debian/changelog
index 3e10f09..e2fead3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+invirt-cluster-config (0.0.12) unstable; urgency=low
+
+  * Use LVM's built-in cluster locking instead of a separate locking
+    library - this is the behavior prefered by modern LVM.
+
+ -- Evan Broder <broder@mit.edu>  Tue, 26 Jan 2010 20:33:32 -0500
+
 invirt-cluster-config (0.0.11) unstable; urgency=low
 
   * Configure a fence_manual fencing device, to allow nodes
diff --git a/debian/transform_lvm.conf.invirt b/debian/transform_lvm.conf.invirt
index 2bda64a..4b7f82b 100755
--- a/debian/transform_lvm.conf.invirt
+++ b/debian/transform_lvm.conf.invirt
@@ -1,8 +1,4 @@
 #!/usr/bin/perl -0p
 s#^( *filter) = .*#$1 = [ "r|/dev/mapper/xenvg-.*|" ]#m or die;
-s/^( *locking_type) = 1.*$/$1 = 2/m or die;
-s/^( *fallback_to_clustered_locking) = .*$/$1 = 0/m or die;
-s/^( *fallback_to_local_locking) = .*$/$1 = 0/m or die;
-s/^( *)# *(locking_library.*)$/$1$2/m or die;
-s/^( *)# *(library_dir.*)$/$1$2/m or die;
+s/^( *locking_type) = 1.*$/$1 = 3/m or die;
 s/^( *retain_min) = .*$/$1 = 2147483647/m or die;