mirror of
https://github.com/AuxXxilium/eudev.git
synced 2025-02-21 17:25:30 +07:00
blkid: Warn when rejecting a superblock with a bad csum
Bump libblkid requirement from 2.20 to 2.24. util-linux 2.25 is actually required since fdbbad981cc5da8bb4ed7e9b6646e7a114745ec5 Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
This commit is contained in:
parent
411ec4713b
commit
c93ec252df
@ -138,6 +138,7 @@ 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;
|
||||
@ -172,7 +173,8 @@ 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_USAGE | BLKID_SUBLKS_VERSION |
|
||||
BLKID_SUBLKS_BADCSUM);
|
||||
|
||||
if (noraid)
|
||||
blkid_probe_filter_superblocks_usage(pr, BLKID_FLTR_NOTIN, BLKID_USAGE_RAID);
|
||||
@ -194,6 +196,15 @@ 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;
|
||||
}
|
||||
|
||||
nvals = blkid_probe_numof_values(pr);
|
||||
for (i = 0; i < nvals; i++) {
|
||||
|
Loading…
Reference in New Issue
Block a user