From: Karel Zak Date: Wed, 21 Jun 2017 08:53:28 +0000 (+0200) Subject: wipefs: exit on failed erase X-Git-Tag: v2.31-rc1~281 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6f1507f135bce5ba7f318c44e05327ca14a0505a;p=thirdparty%2Futil-linux.git wipefs: exit on failed erase The current behavior is to report error and continue, it seems strange: # blockdev --setro /dev/sdc # wipefs -a /dev/sdc wipefs: /dev/sdc: failed to erase xfs magic string at offset 0x00000000: Operation not permitted /dev/sdc: 4 bytes were erased at offset 0x00000000 (xfs): 58 46 53 42 ^^^^^^^^^^^ not true The patch calls err() to exit. Reported-by: Vratislav Podzimek Signed-off-by: Karel Zak --- diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c index e07ce18e34..209ed7147b 100644 --- a/misc-utils/wipefs.c +++ b/misc-utils/wipefs.c @@ -310,7 +310,7 @@ static void do_wipe_real(blkid_probe pr, const char *devname, size_t i; if (blkid_do_wipe(pr, (flags & WP_FL_NOACT) != 0)) - warn(_("%s: failed to erase %s magic string at offset 0x%08jx"), + err(EXIT_FAILURE, _("%s: failed to erase %s magic string at offset 0x%08jx"), devname, w->type, (intmax_t)w->offset); if (flags & WP_FL_QUIET)