Correct example.conf to indicate that lvm2 not lvm1 is the default format.

Remove an unused stray LVM1_SUPPORT ifdef.

diff --git a/WHATS_NEW b/WHATS_NEW
index 1c977fbac226b9b50ea7839bb34b03318f0b9402..29e94692edcc169415080cee96db856e0bb089ae 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,7 @@
 Version 2.02.54 -
 =====================================
+  Correct example.conf to indicate that lvm2 not lvm1 is the default format.
+  Remove an unused stray LVM1_SUPPORT ifdef.
   Only include selinux libs in libdevmapper.pc when selinux build enabled.
   Allow for a build directory separate from the source.
   Update distclean target for rename clogd to cmirrord. (2.02.52)

diff --git a/doc/example.conf b/doc/example.conf
index f254325f064b39a5a5f3c31865ffe74a0e46cf82..1067665da12b1fdb1246080688641b5b3a43c08f 100644 (file)
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -262,8 +262,8 @@ global {
 
     # The default metadata format that commands should use - "lvm1" or "lvm2".
     # The command line override is -M1 or -M2.
-    # Defaults to "lvm1" if compiled in, else "lvm2".
-    # format = "lvm1"
+    # Defaults to "lvm2".
+    # format = "lvm2"
 
     # Location of proc filesystem
     proc = "/proc"

diff --git a/lib/config/defaults.h b/lib/config/defaults.h
index 7ce96abc49c1684594ab7780b61231e4f30a6185..824fec2e0e817252e0c3a689fb26e50e21a0579c 100644 (file)
--- a/lib/config/defaults.h
+++ b/lib/config/defaults.h
@@ -58,11 +58,7 @@
 #  define DEFAULT_FALLBACK_TO_LVM1 0
 #endif
 
-#ifdef LVM1_SUPPORT
-#  define DEFAULT_FORMAT "lvm1"
-#else
-#  define DEFAULT_FORMAT "lvm2"
-#endif
+#define DEFAULT_FORMAT "lvm2"
 
 #define DEFAULT_STRIPESIZE 64  /* KB */
 #define DEFAULT_PVMETADATASIZE 255