diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/config/config_settings.h | 2 | ||||
| -rw-r--r-- | lib/config/defaults.h | 6 | ||||
| -rw-r--r-- | lib/misc/configure.h.in | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h index fb05b857a..cac197835 100644 --- a/lib/config/config_settings.h +++ b/lib/config/config_settings.h @@ -628,7 +628,7 @@ cfg(global_activation_CFG, "activation", global_CFG_SECTION, 0, CFG_TYPE_BOOL, D "is not present in the kernel, disabling this should suppress\n" "the error messages.\n") -cfg(global_fallback_to_lvm1_CFG, "fallback_to_lvm1", global_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, DEFAULT_FALLBACK_TO_LVM1, vsn(1, 0, 18), NULL, 0, NULL, +cfg(global_fallback_to_lvm1_CFG, "fallback_to_lvm1", global_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, DEFAULT_FALLBACK_TO_LVM1, vsn(1, 0, 18), "@DEFAULT_FALLBACK_TO_LVM1@", 0, NULL, "Try running LVM1 tools if LVM cannot communicate with DM.\n" "This option only applies to 2.4 kernels and is provided to\n" "help switch between device-mapper kernels and LVM1 kernels.\n" diff --git a/lib/config/defaults.h b/lib/config/defaults.h index 3745639fe..2d74c17bd 100644 --- a/lib/config/defaults.h +++ b/lib/config/defaults.h @@ -111,12 +111,6 @@ #define DEFAULT_UMASK 0077 -#ifdef LVM1_FALLBACK -# define DEFAULT_FALLBACK_TO_LVM1 1 -#else -# define DEFAULT_FALLBACK_TO_LVM1 0 -#endif - #define DEFAULT_FORMAT "lvm2" #define DEFAULT_STRIPESIZE 64 /* KB */ diff --git a/lib/misc/configure.h.in b/lib/misc/configure.h.in index 9ec997fa9..6daf105aa 100644 --- a/lib/misc/configure.h.in +++ b/lib/misc/configure.h.in @@ -68,6 +68,10 @@ /* Default system configuration directory. */ #undef DEFAULT_ETC_DIR +/* Fall back to LVM1 by default if device-mapper is missing from the kernel. + */ +#undef DEFAULT_FALLBACK_TO_LVM1 + /* Name of default locking directory. */ #undef DEFAULT_LOCK_DIR |