From 6cd671d42798cb6f5746dfbe3dc84576836c2b00 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 4 Sep 2019 14:51:02 +0200 Subject: [PATCH] fdisk: cleanup wipe warning Let's remove 'old' from the sentence, add man page reference to sfdisk. Signed-off-by: Karel Zak --- disk-utils/fdisk.c | 4 ++-- disk-utils/sfdisk.c | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/disk-utils/fdisk.c b/disk-utils/fdisk.c index b86448061..81334d06c 100644 --- a/disk-utils/fdisk.c +++ b/disk-utils/fdisk.c @@ -797,12 +797,12 @@ void follow_wipe_mode(struct fdisk_context *cxt) fdisk_enable_wipe(cxt, dowipe); if (dowipe) fdisk_warnx(cxt, _( - "The old %s signature will be removed by a write command. " + "The device contains '%s' signature and it will be removed by a write command. " "See fdisk(8) man page and --wipe option for more details."), fdisk_get_collision(cxt)); else fdisk_warnx(cxt, _( - "The old %s signature may remain on the device. " + "The device contains '%s' signature and it may remain on the device. " "It is recommended to wipe the device with wipefs(8) or " "fdisk --wipe, in order to avoid possible collisions."), fdisk_get_collision(cxt)); diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c index 37d652b2f..703292913 100644 --- a/disk-utils/sfdisk.c +++ b/disk-utils/sfdisk.c @@ -1476,13 +1476,15 @@ static void follow_wipe_mode(struct sfdisk *sf) if (dowipe) { if (!fdisk_is_ptcollision(sf->cxt)) { - fdisk_info(sf->cxt, _("The old %s signature will be removed by a write command."), - fdisk_get_collision(sf->cxt)); + fdisk_warn(sf->cxt, _( + "The device contains '%s' signature and it will be removed by a write command. " + "See sfdisk(8) man page and --wipe option for more details."), + fdisk_get_collision(sf->cxt)); fputc('\n', stdout); } } else { fdisk_warnx(sf->cxt, _( - "The old %s signature may remain on the device. " + "The device contains '%s' signature and it may remain on the device. " "It is recommended to wipe the device with wipefs(8) or " "sfdisk --wipe, in order to avoid possible collisions."), fdisk_get_collision(sf->cxt));