From 1ddcf370a704fa7aa1865405708fa0f44793c280 Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Mon, 5 Oct 2009 12:44:20 +0000 Subject: [PATCH] Correct example.conf to indicate that lvm2 not lvm1 is the default format. Remove an unused stray LVM1_SUPPORT ifdef. --- WHATS_NEW | 2 ++ doc/example.conf | 4 ++-- lib/config/defaults.h | 6 +----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 1c977fbac..29e94692e 100644 --- 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 f254325f0..1067665da 100644 --- 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 7ce96abc4..824fec2e0 100644 --- 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 -- 2.43.5