From 586f280f03b473b7c63d6d2bd8b80b4abb487965 Mon Sep 17 00:00:00 2001
From: Danny Rawlins <monster.romster@gmail.com>
Date: Fri, 24 Oct 2008 18:54:05 +1100
Subject: [PATCH] lvm2: global-locking-conf.patch

---
 lvm2/.md5sum                                  |  3 ++-
 lvm2/Pkgfile                                  |  8 ++++---
 lvm2/lvm2-2.02.41_global-locking-conf.patch   | 22 +++++++++++++++++++
 ...ror.patch => lvm2-2.02.41_lv-mirror.patch} |  0
 4 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 lvm2/lvm2-2.02.41_global-locking-conf.patch
 rename lvm2/{lvm-2.02.41_lv-mirror.patch => lvm2-2.02.41_lv-mirror.patch} (100%)

diff --git a/lvm2/.md5sum b/lvm2/.md5sum
index cdc9a679b..e252666a7 100644
--- a/lvm2/.md5sum
+++ b/lvm2/.md5sum
@@ -1,2 +1,3 @@
 e5b1927825ea2ef4a270606e881d9c88  LVM2.2.02.41.tgz
-4e831566d153ece89684b0c5fa874d65  lvm-2.02.41_lv-mirror.patch
+7605c4380c33836ab1a13250a02a2870  lvm2-2.02.41_global-locking-conf.patch
+4e831566d153ece89684b0c5fa874d65  lvm2-2.02.41_lv-mirror.patch
diff --git a/lvm2/Pkgfile b/lvm2/Pkgfile
index c2642ba02..0d6c9bc67 100644
--- a/lvm2/Pkgfile
+++ b/lvm2/Pkgfile
@@ -6,14 +6,16 @@
 
 name=lvm2
 version=2.02.41
-release=2
+release=3
 source=(ftp://sources.redhat.com/pub/lvm2/LVM2.$version.tgz
-	lvm-2.02.41_lv-mirror.patch)
+	lvm2-2.02.41_lv-mirror.patch
+	lvm2-2.02.41_global-locking-conf.patch)
 
 build() {
 	cd LVM2.$version
 
-	patch -p 1 -i $SRC/lvm-2.02.41_lv-mirror.patch
+	patch -p 1 -i $SRC/lvm2-2.02.41_lv-mirror.patch
+	patch -p 1 -i $SRC/lvm2-2.02.41_global-locking-conf.patch
 
 	./configure \
 		--prefix=/usr \
diff --git a/lvm2/lvm2-2.02.41_global-locking-conf.patch b/lvm2/lvm2-2.02.41_global-locking-conf.patch
new file mode 100644
index 000000000..a3ee0baee
--- /dev/null
+++ b/lvm2/lvm2-2.02.41_global-locking-conf.patch
@@ -0,0 +1,22 @@
+--- LVM2/lib/locking/locking.c	2008/09/10 10:14:59	1.50
++++ LVM2/lib/locking/locking.c	2008/10/24 01:16:16	1.51
+@@ -233,7 +233,8 @@
+ 				return 1;
+ 		}
+ 		if (!find_config_tree_int(cmd, "locking/fallback_to_clustered_locking",
+-					  DEFAULT_FALLBACK_TO_CLUSTERED_LOCKING))
++			    find_config_tree_int(cmd, "global/fallback_to_clustered_locking",
++						 DEFAULT_FALLBACK_TO_CLUSTERED_LOCKING)))
+ 			break;
+ #endif
+ 
+@@ -255,7 +256,8 @@
+ 
+ 	if ((type == 2 || type == 3) &&
+ 	    find_config_tree_int(cmd, "locking/fallback_to_local_locking",
+-				 DEFAULT_FALLBACK_TO_LOCAL_LOCKING)) {
++	    	    find_config_tree_int(cmd, "global/fallback_to_local_locking",
++					 DEFAULT_FALLBACK_TO_LOCAL_LOCKING))) {
+ 		log_warn("WARNING: Falling back to local file-based locking.");
+ 		log_warn("Volume Groups with the clustered attribute will "
+ 			  "be inaccessible.");
diff --git a/lvm2/lvm-2.02.41_lv-mirror.patch b/lvm2/lvm2-2.02.41_lv-mirror.patch
similarity index 100%
rename from lvm2/lvm-2.02.41_lv-mirror.patch
rename to lvm2/lvm2-2.02.41_lv-mirror.patch