diff options
| author | Peter Rajnoha <prajnoha@redhat.com> | 2016-01-21 09:56:07 +0100 |
|---|---|---|
| committer | Peter Rajnoha <prajnoha@redhat.com> | 2016-01-21 10:01:34 +0100 |
| commit | 43b436398ec81c8d0a2dbd2062ce864997d22f26 (patch) | |
| tree | c87f371ca71939e7be15c93fc555994e513041c1 | |
| parent | 21028a7903a8ef78e3dbda6afbd245c1cae1aae8 (diff) | |
| download | lvm2-43b436398ec81c8d0a2dbd2062ce864997d22f26.tar.gz | |
configure: fix configure to set proper use_blkid_wiping if autodetected as disabled
If not using explicit --enable-blkid-wiping/--disable-blkid-wiping
configure option, the configure script tries to enable/disable blkid
wiping feature automatically based on blkid library version found.
The script incorrectly set default value for lvm.conf's
allocation/use_blkid_wiping" setting to "1" (enabled) if proper
blkid library version was not found or the version found was less
than the minimum required. It should be set to "0" in this case.
| -rw-r--r-- | WHATS_NEW | 1 | ||||
| -rw-r--r-- | aclocal.m4 | 2 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.in | 2 |
4 files changed, 4 insertions, 3 deletions
@@ -1,5 +1,6 @@ Version 2.02.141 - ==================================== + Fix configure to set proper use_blkid_wiping if autodetected as disabled. Initialise udev in clvmd for use in device scanning. (2.02.116) Add seg_le_ranges report field for common format when displaying seg devices. Honour report/list_item_separator for seg_metadata_le_ranges report field. diff --git a/aclocal.m4 b/aclocal.m4 index 67b2d59a0..05e0ad530 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -15,7 +15,7 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # serial 1 (pkg-config-0.24) # -# Copyright (c) 2004 Scott James Remnant <scott@netsplit.com>. +# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -11791,7 +11791,7 @@ fi $as_echo "#define BLKID_WIPING_SUPPORT 1" >>confdefs.h else - DEFAULT_USE_BLKID_WIPING=1 + DEFAULT_USE_BLKID_WIPING=0 fi else DEFAULT_USE_BLKID_WIPING=0 diff --git a/configure.in b/configure.in index 8e04782d0..2cad90201 100644 --- a/configure.in +++ b/configure.in @@ -1291,7 +1291,7 @@ if test "$BLKID_WIPING" != no; then DEFAULT_USE_BLKID_WIPING=1 AC_DEFINE([BLKID_WIPING_SUPPORT], 1, [Define to 1 to use libblkid detection of signatures when wiping.]) else - DEFAULT_USE_BLKID_WIPING=1 + DEFAULT_USE_BLKID_WIPING=0 fi else DEFAULT_USE_BLKID_WIPING=0 |