Change default locking_lib to liblvm2clusterlock.so.

diff --git a/WHATS_NEW b/WHATS_NEW
index d9c9cf2cee73919824f765efbcb699c2225723f5..b301c623d95145f3f5827801b887301da66d3bcf 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.10 - 
 ==================================
+  Change default locking_lib to liblvm2clusterlock.so.
   Add skip_dev_dir() to process command line VGs.
   Stop clvmd complaining about nodes that have left the cluster.
   Move lvm_snprintf(), split_words() and split_dm_name() into libdevmapper.

diff --git a/doc/example.conf b/doc/example.conf
index 277ced8f9a7a0f42027e58fb27acfdd0d228dcb4..c4c6a07a44825ca4ff15ced21189843ded6d5ae4 100644 (file)
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -223,6 +223,9 @@ global {
 
     # Search this directory first for shared libraries.
     #   library_dir = "/lib"
+
+    # The external locking library to load if locking_type is set to 2.
+    #   locking_library = "liblvm2clusterlock.so"
 }
 
 activation {

diff --git a/lib/config/defaults.h b/lib/config/defaults.h
index ebeaf582f7fee1346bd9f4b3f2a713e9b0977d45..31686f227458b72e60ffe93b7b6a3c604d9f99ef 100644 (file)
--- a/lib/config/defaults.h
+++ b/lib/config/defaults.h
@@ -32,7 +32,7 @@
 #define DEFAULT_MD_COMPONENT_DETECTION 1
 
 #define DEFAULT_LOCK_DIR "/var/lock/lvm"
-#define DEFAULT_LOCKING_LIB "lvm2_locking.so"
+#define DEFAULT_LOCKING_LIB "liblvm2clusterlock.so"
 
 #define DEFAULT_MIRROR_LOG_FAULT_POLICY "allocate"
 #define DEFAULT_MIRROR_DEV_FAULT_POLICY "remove"

diff --git a/man/lvm.conf.5 b/man/lvm.conf.5
index 104ed5a500672200ab714fab0938b51d689e2b19..d6f963ab80fba78b41296472aad15032bb556e2b 100644 (file)
--- a/man/lvm.conf.5
+++ b/man/lvm.conf.5
@@ -252,7 +252,7 @@ if \fBlocking_type\fP is set to 1.  The default is \fB/var/lock/lvm\fP.
 .IP
 \fBlocking_library\fP \(em The name of the external locking
 library to load if \fBlocking_type\fP is set to 2.
-The default is \fBlvm2_locking.so\fP.  If you need to write
+The default is \fBliblvm2clusterlock.so\fP.  If you need to write
 such a library, look at the lib/locking source code directory.
 .TP
 \fBtags\fP \(em Host tag settings