|
 |
2b52f6 |
configure | 20 ++++++++++----------
|
|
|
2b52f6 |
configure.ac | 4 ++--
|
|
|
2b52f6 |
lib/device/dev-type.c | 3 +--
|
|
|
2b52f6 |
3 files changed, 13 insertions(+), 14 deletions(-)
|
|
|
2b52f6 |
|
|
|
2b52f6 |
diff --git a/configure b/configure
|
|
|
aaf7d4 |
index fe0e8e2..ce37d03 100755
|
|
|
2b52f6 |
--- a/configure
|
|
|
2b52f6 |
+++ b/configure
|
|
|
2b52f6 |
@@ -12111,12 +12111,12 @@ if test -n "$BLKID_CFLAGS"; then
|
|
|
2b52f6 |
pkg_cv_BLKID_CFLAGS="$BLKID_CFLAGS"
|
|
|
2b52f6 |
elif test -n "$PKG_CONFIG"; then
|
|
|
2b52f6 |
if test -n "$PKG_CONFIG" && \
|
|
|
2b52f6 |
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid >= 2.24\""; } >&5
|
|
|
2b52f6 |
- ($PKG_CONFIG --exists --print-errors "blkid >= 2.24") 2>&5
|
|
|
2b52f6 |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid >= 2.23\""; } >&5
|
|
|
2b52f6 |
+ ($PKG_CONFIG --exists --print-errors "blkid >= 2.23") 2>&5
|
|
|
2b52f6 |
ac_status=$?
|
|
|
2b52f6 |
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
|
2b52f6 |
test $ac_status = 0; }; then
|
|
|
2b52f6 |
- pkg_cv_BLKID_CFLAGS=`$PKG_CONFIG --cflags "blkid >= 2.24" 2>/dev/null`
|
|
|
2b52f6 |
+ pkg_cv_BLKID_CFLAGS=`$PKG_CONFIG --cflags "blkid >= 2.23" 2>/dev/null`
|
|
|
2b52f6 |
test "x$?" != "x0" && pkg_failed=yes
|
|
|
2b52f6 |
else
|
|
|
2b52f6 |
pkg_failed=yes
|
|
|
2b52f6 |
@@ -12128,12 +12128,12 @@ if test -n "$BLKID_LIBS"; then
|
|
|
2b52f6 |
pkg_cv_BLKID_LIBS="$BLKID_LIBS"
|
|
|
2b52f6 |
elif test -n "$PKG_CONFIG"; then
|
|
|
2b52f6 |
if test -n "$PKG_CONFIG" && \
|
|
|
2b52f6 |
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid >= 2.24\""; } >&5
|
|
|
2b52f6 |
- ($PKG_CONFIG --exists --print-errors "blkid >= 2.24") 2>&5
|
|
|
2b52f6 |
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"blkid >= 2.23\""; } >&5
|
|
|
2b52f6 |
+ ($PKG_CONFIG --exists --print-errors "blkid >= 2.23") 2>&5
|
|
|
2b52f6 |
ac_status=$?
|
|
|
2b52f6 |
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
|
2b52f6 |
test $ac_status = 0; }; then
|
|
|
2b52f6 |
- pkg_cv_BLKID_LIBS=`$PKG_CONFIG --libs "blkid >= 2.24" 2>/dev/null`
|
|
|
2b52f6 |
+ pkg_cv_BLKID_LIBS=`$PKG_CONFIG --libs "blkid >= 2.23" 2>/dev/null`
|
|
|
2b52f6 |
test "x$?" != "x0" && pkg_failed=yes
|
|
|
2b52f6 |
else
|
|
|
2b52f6 |
pkg_failed=yes
|
|
|
2b52f6 |
@@ -12154,9 +12154,9 @@ else
|
|
|
2b52f6 |
_pkg_short_errors_supported=no
|
|
|
2b52f6 |
fi
|
|
|
2b52f6 |
if test $_pkg_short_errors_supported = yes; then
|
|
|
2b52f6 |
- BLKID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "blkid >= 2.24" 2>&1`
|
|
|
2b52f6 |
+ BLKID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "blkid >= 2.23" 2>&1`
|
|
|
2b52f6 |
else
|
|
|
2b52f6 |
- BLKID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "blkid >= 2.24" 2>&1`
|
|
|
2b52f6 |
+ BLKID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "blkid >= 2.23" 2>&1`
|
|
|
2b52f6 |
fi
|
|
|
2b52f6 |
# Put the nasty error message in config.log where it belongs
|
|
|
2b52f6 |
echo "$BLKID_PKG_ERRORS" >&5
|
|
|
2b52f6 |
@@ -12164,7 +12164,7 @@ fi
|
|
|
2b52f6 |
if test "$BLKID_WIPING" = maybe; then
|
|
|
2b52f6 |
BLKID_WIPING=no
|
|
|
2b52f6 |
else
|
|
|
2b52f6 |
- as_fn_error $? "bailing out... blkid library >= 2.24 is required" "$LINENO" 5
|
|
|
2b52f6 |
+ as_fn_error $? "bailing out... blkid library >= 2.23 is required" "$LINENO" 5
|
|
|
2b52f6 |
fi
|
|
|
2b52f6 |
elif test $pkg_failed = untried; then
|
|
|
2b52f6 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
2b52f6 |
@@ -12172,7 +12172,7 @@ $as_echo "no" >&6; }
|
|
|
2b52f6 |
if test "$BLKID_WIPING" = maybe; then
|
|
|
2b52f6 |
BLKID_WIPING=no
|
|
|
2b52f6 |
else
|
|
|
2b52f6 |
- as_fn_error $? "bailing out... blkid library >= 2.24 is required" "$LINENO" 5
|
|
|
2b52f6 |
+ as_fn_error $? "bailing out... blkid library >= 2.23 is required" "$LINENO" 5
|
|
|
2b52f6 |
fi
|
|
|
2b52f6 |
else
|
|
|
2b52f6 |
BLKID_CFLAGS=$pkg_cv_BLKID_CFLAGS
|
|
|
2b52f6 |
diff --git a/configure.ac b/configure.ac
|
|
|
2b52f6 |
index 379d37f..e6bb905 100644
|
|
|
2b52f6 |
--- a/configure.ac
|
|
|
2b52f6 |
+++ b/configure.ac
|
|
|
2b52f6 |
@@ -1235,7 +1235,7 @@ AC_ARG_ENABLE(blkid_wiping,
|
|
|
2b52f6 |
DEFAULT_USE_BLKID_WIPING=0
|
|
|
2b52f6 |
if test "$BLKID_WIPING" != no; then
|
|
|
2b52f6 |
pkg_config_init
|
|
|
2b52f6 |
- PKG_CHECK_MODULES(BLKID, blkid >= 2.24,
|
|
|
2b52f6 |
+ PKG_CHECK_MODULES(BLKID, blkid >= 2.23,
|
|
|
2b52f6 |
[ BLKID_WIPING=yes
|
|
|
2b52f6 |
BLKID_PC="blkid"
|
|
|
2b52f6 |
DEFAULT_USE_BLKID_WIPING=1
|
|
|
2b52f6 |
@@ -1243,7 +1243,7 @@ if test "$BLKID_WIPING" != no; then
|
|
|
2b52f6 |
], [if test "$BLKID_WIPING" = maybe; then
|
|
|
2b52f6 |
BLKID_WIPING=no
|
|
|
2b52f6 |
else
|
|
|
2b52f6 |
- AC_MSG_ERROR([bailing out... blkid library >= 2.24 is required])
|
|
|
2b52f6 |
+ AC_MSG_ERROR([bailing out... blkid library >= 2.23 is required])
|
|
|
2b52f6 |
fi])
|
|
|
2b52f6 |
fi
|
|
|
2b52f6 |
AC_MSG_CHECKING([whether to enable libblkid detection of signatures when wiping])
|
|
|
2b52f6 |
diff --git a/lib/device/dev-type.c b/lib/device/dev-type.c
|
|
|
2b52f6 |
index 14a28dc..c2e2365 100644
|
|
|
2b52f6 |
--- a/lib/device/dev-type.c
|
|
|
2b52f6 |
+++ b/lib/device/dev-type.c
|
|
|
2b52f6 |
@@ -711,8 +711,7 @@ static int _wipe_known_signatures_with_blkid(struct device *dev, const char *nam
|
|
|
2b52f6 |
BLKID_SUBLKS_TYPE |
|
|
|
2b52f6 |
BLKID_SUBLKS_USAGE |
|
|
|
2b52f6 |
BLKID_SUBLKS_VERSION |
|
|
|
2b52f6 |
- BLKID_SUBLKS_MAGIC |
|
|
|
2b52f6 |
- BLKID_SUBLKS_BADCSUM);
|
|
|
2b52f6 |
+ BLKID_SUBLKS_MAGIC);
|
|
|
2b52f6 |
|
|
|
2b52f6 |
while (!blkid_do_probe(probe)) {
|
|
|
2b52f6 |
if ((r_wipe = _blkid_wipe(probe, dev, name, types_to_exclude, types_no_prompt, yes, force)) == 1) {
|