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

fdisk: cleanup wipe warning 

Let's remove 'old' from the sentence, add man page reference to
sfdisk.

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2019-09-04 14:51:02 +02:00
parent 03154d2cf2
commit 6cd671d427
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
disk-utils/fdisk.c
View File

@ -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));

8
disk-utils/sfdisk.c
View File

@ -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));