ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

blkdiscard: do not probe for signatures on --force 

The command-line option --force is defined as "disable all checks",
but the current code does not follow this idea. We need a way how to
disable read from the device (for example for dm-integrity devices).

Fixes: https://github.com/karelzak/util-linux/issues/1308
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2021-05-13 10:34:14 +02:00
parent cef52b197a
commit e304441936
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
sys-utils/blkdiscard.c
View File

@ -258,25 +258,28 @@ int main(int argc, char **argv)
errx(EXIT_FAILURE, _("%s: length %" PRIu64 " is not aligned "
"to sector size %i"), path, range[1], secsize);
#ifdef HAVE_LIBBLKID
/* Check for existing signatures on the device */
switch(probe_device(fd, path)) {
case 0: /* signature detected */
/*
* Only require force in interactive mode to avoid
* breaking existing scripts
*/
if (!force && isatty(STDIN_FILENO)) {
errx(EXIT_FAILURE,
_("This is destructive operation, data will " \
"be lost! Use the -f option to override."));
}
if (force)
warnx(_("Operation forced, data will be lost!"));
break;
case 1: /* no signature */
break;
default: /* error */
err(EXIT_FAILURE, _("failed to probe the device"));
break;
else {
/* Check for existing signatures on the device */
switch(probe_device(fd, path)) {
case 0: /* signature detected */
/*
* Only require force in interactive mode to avoid
* breaking existing scripts
*/
if (isatty(STDIN_FILENO)) {
errx(EXIT_FAILURE,
_("This is destructive operation, data will " \
"be lost! Use the -f option to override."));
}
break;
case 1: /* no signature */
break;
default: /* error */
err(EXIT_FAILURE, _("failed to probe the device"));
break;
}
}
#endif /* HAVE_LIBBLKID */