You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
77 lines
3.3 KiB
77 lines
3.3 KiB
From f1faa24b260222e70d38492e5e3f126700dbd9f8 Mon Sep 17 00:00:00 2001 |
|
From: Lukas Nykryn <lnykryn@redhat.com> |
|
Date: Wed, 4 Mar 2015 16:10:36 +0100 |
|
Subject: [PATCH] Revert "blkid: Warn when rejecting a superblock with a bad |
|
csum" |
|
|
|
This reverts commit d47f6ca5f9b7a0b400d8bdb050151a0284fb4bdb. |
|
--- |
|
README | 2 +- |
|
configure.ac | 2 +- |
|
src/udev/udev-builtin-blkid.c | 13 +------------ |
|
3 files changed, 3 insertions(+), 14 deletions(-) |
|
|
|
diff --git a/README b/README |
|
index 287d05c9b4..ac2a81c0cc 100644 |
|
--- a/README |
|
+++ b/README |
|
@@ -115,7 +115,7 @@ REQUIREMENTS: |
|
libcap |
|
libmount >= 2.20 (from util-linux) |
|
libseccomp >= 1.0.0 (optional) |
|
- libblkid >= 2.24 (from util-linux) (optional) |
|
+ libblkid >= 2.20 (from util-linux) (optional) |
|
libkmod >= 15 (optional) |
|
PAM >= 1.1.2 (optional) |
|
libcryptsetup (optional) |
|
diff --git a/configure.ac b/configure.ac |
|
index f701bcf716..9c25c3c6fc 100644 |
|
--- a/configure.ac |
|
+++ b/configure.ac |
|
@@ -437,7 +437,7 @@ AM_CONDITIONAL(HAVE_XKBCOMMON, [test "$have_xkbcommon" = "yes"]) |
|
have_blkid=no |
|
AC_ARG_ENABLE(blkid, AS_HELP_STRING([--disable-blkid], [disable blkid support])) |
|
if test "x$enable_blkid" != "xno"; then |
|
- PKG_CHECK_MODULES(BLKID, [ blkid >= 2.24 ], |
|
+ PKG_CHECK_MODULES(BLKID, [ blkid >= 2.20 ], |
|
[AC_DEFINE(HAVE_BLKID, 1, [Define if blkid is available]) have_blkid=yes], have_blkid=no) |
|
if test "x$have_blkid" = xno -a "x$enable_blkid" = xyes; then |
|
AC_MSG_ERROR([*** blkid support requested but libraries not found]) |
|
diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c |
|
index 03e3dc2867..89995831b1 100644 |
|
--- a/src/udev/udev-builtin-blkid.c |
|
+++ b/src/udev/udev-builtin-blkid.c |
|
@@ -221,7 +221,6 @@ static int builtin_blkid(struct udev_device *dev, int argc, char *argv[], bool t |
|
blkid_probe pr; |
|
const char *data; |
|
const char *name; |
|
- const char *prtype = NULL; |
|
int nvals; |
|
int i; |
|
int err = 0; |
|
@@ -257,8 +256,7 @@ static int builtin_blkid(struct udev_device *dev, int argc, char *argv[], bool t |
|
blkid_probe_set_superblocks_flags(pr, |
|
BLKID_SUBLKS_LABEL | BLKID_SUBLKS_UUID | |
|
BLKID_SUBLKS_TYPE | BLKID_SUBLKS_SECTYPE | |
|
- BLKID_SUBLKS_USAGE | BLKID_SUBLKS_VERSION | |
|
- BLKID_SUBLKS_BADCSUM); |
|
+ BLKID_SUBLKS_USAGE | BLKID_SUBLKS_VERSION); |
|
|
|
if (noraid) |
|
blkid_probe_filter_superblocks_usage(pr, BLKID_FLTR_NOTIN, BLKID_USAGE_RAID); |
|
@@ -280,15 +278,6 @@ static int builtin_blkid(struct udev_device *dev, int argc, char *argv[], bool t |
|
err = probe_superblocks(pr); |
|
if (err < 0) |
|
goto out; |
|
- if (blkid_probe_has_value(pr, "SBBADCSUM")) { |
|
- if (!blkid_probe_lookup_value(pr, "TYPE", &prtype, NULL)) |
|
- log_warning("incorrect %s checksum on %s", |
|
- prtype, udev_device_get_devnode(dev)); |
|
- else |
|
- log_warning("incorrect checksum on %s", |
|
- udev_device_get_devnode(dev)); |
|
- goto out; |
|
- } |
|
|
|
/* If we are a partition then our parent passed on the root |
|
* partition UUID to us */
|
|
|