mrc0mmand / rpms / lvm2

Forked from rpms/lvm2 3 years ago
Clone
Blob Blame History Raw
 configure             |   20 ++++++++++----------
 configure.in          |    4 ++--
 lib/device/dev-type.c |    3 +--
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/configure b/configure
index a156460..c96911c 100755
--- a/configure
+++ b/configure
@@ -9484,12 +9484,12 @@ if test -n "$BLKID_CFLAGS"; then
     pkg_cv_BLKID_CFLAGS="$BLKID_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid >= 2.24\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "blkid >= 2.24") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid >= 2.23\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "blkid >= 2.23") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_BLKID_CFLAGS=`$PKG_CONFIG --cflags "blkid >= 2.24" 2>/dev/null`
+  pkg_cv_BLKID_CFLAGS=`$PKG_CONFIG --cflags "blkid >= 2.23" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -9500,12 +9500,12 @@ if test -n "$BLKID_LIBS"; then
     pkg_cv_BLKID_LIBS="$BLKID_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid >= 2.24\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "blkid >= 2.24") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid >= 2.23\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "blkid >= 2.23") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_BLKID_LIBS=`$PKG_CONFIG --libs "blkid >= 2.24" 2>/dev/null`
+  pkg_cv_BLKID_LIBS=`$PKG_CONFIG --libs "blkid >= 2.23" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -9525,9 +9525,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        BLKID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "blkid >= 2.24" 2>&1`
+	        BLKID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "blkid >= 2.23" 2>&1`
         else
-	        BLKID_PKG_ERRORS=`$PKG_CONFIG --print-errors "blkid >= 2.24" 2>&1`
+	        BLKID_PKG_ERRORS=`$PKG_CONFIG --print-errors "blkid >= 2.23" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$BLKID_PKG_ERRORS" >&5
@@ -9535,7 +9535,7 @@ fi
 	if test x$BLKID_WIPING = xmaybe; then
 					BLKID_WIPING=no
 				 else
-					as_fn_error $? "bailing out... blkid library >= 2.24 is required" "$LINENO" 5
+					as_fn_error $? "bailing out... blkid library >= 2.23 is required" "$LINENO" 5
 				 fi
 
 elif test $pkg_failed = untried; then
@@ -9544,7 +9544,7 @@ $as_echo "no" >&6; }
 	if test x$BLKID_WIPING = xmaybe; then
 					BLKID_WIPING=no
 				 else
-					as_fn_error $? "bailing out... blkid library >= 2.24 is required" "$LINENO" 5
+					as_fn_error $? "bailing out... blkid library >= 2.23 is required" "$LINENO" 5
 				 fi
 
 else
diff --git a/configure.in b/configure.in
index 3e0e508..cff7e45 100644
--- a/configure.in
+++ b/configure.in
@@ -981,14 +981,14 @@ if test x$BLKID_WIPING != xno; then
 	if test x$PKGCONFIG_INIT != x1; then
 		pkg_config_init
 	fi
-	PKG_CHECK_MODULES(BLKID, blkid >= 2.24,
+	PKG_CHECK_MODULES(BLKID, blkid >= 2.23,
 				[if test x$BLKID_WIPING = xmaybe; then
 					BLKID_WIPING=yes
 				 fi],
 				[if test x$BLKID_WIPING = xmaybe; then
 					BLKID_WIPING=no
 				 else
-					AC_MSG_ERROR([bailing out... blkid library >= 2.24 is required])
+					AC_MSG_ERROR([bailing out... blkid library >= 2.23 is required])
 				 fi
 				])
 	if test x$BLKID_WIPING = xyes; then
diff --git a/lib/device/dev-type.c b/lib/device/dev-type.c
index 78b093c..02bc99f 100644
--- a/lib/device/dev-type.c
+++ b/lib/device/dev-type.c
@@ -521,8 +521,7 @@ static int _wipe_known_signatures_with_blkid(struct device *dev, const char *nam
 						 BLKID_SUBLKS_TYPE |
 						 BLKID_SUBLKS_USAGE |
 						 BLKID_SUBLKS_VERSION |
-						 BLKID_SUBLKS_MAGIC |
-						 BLKID_SUBLKS_BADCSUM);
+						 BLKID_SUBLKS_MAGIC);
 
 	while (!blkid_do_probe(probe)) {
 		found++;