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:
parent
03154d2cf2
commit
6cd671d427
|
@ -797,12 +797,12 @@ void follow_wipe_mode(struct fdisk_context *cxt)
|
||||||
fdisk_enable_wipe(cxt, dowipe);
|
fdisk_enable_wipe(cxt, dowipe);
|
||||||
if (dowipe)
|
if (dowipe)
|
||||||
fdisk_warnx(cxt, _(
|
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."),
|
"See fdisk(8) man page and --wipe option for more details."),
|
||||||
fdisk_get_collision(cxt));
|
fdisk_get_collision(cxt));
|
||||||
else
|
else
|
||||||
fdisk_warnx(cxt, _(
|
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 "
|
"It is recommended to wipe the device with wipefs(8) or "
|
||||||
"fdisk --wipe, in order to avoid possible collisions."),
|
"fdisk --wipe, in order to avoid possible collisions."),
|
||||||
fdisk_get_collision(cxt));
|
fdisk_get_collision(cxt));
|
||||||
|
|
|
@ -1476,13 +1476,15 @@ static void follow_wipe_mode(struct sfdisk *sf)
|
||||||
|
|
||||||
if (dowipe) {
|
if (dowipe) {
|
||||||
if (!fdisk_is_ptcollision(sf->cxt)) {
|
if (!fdisk_is_ptcollision(sf->cxt)) {
|
||||||
fdisk_info(sf->cxt, _("The old %s signature will be removed by a write command."),
|
fdisk_warn(sf->cxt, _(
|
||||||
fdisk_get_collision(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);
|
fputc('\n', stdout);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
fdisk_warnx(sf->cxt, _(
|
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 "
|
"It is recommended to wipe the device with wipefs(8) or "
|
||||||
"sfdisk --wipe, in order to avoid possible collisions."),
|
"sfdisk --wipe, in order to avoid possible collisions."),
|
||||||
fdisk_get_collision(sf->cxt));
|
fdisk_get_collision(sf->cxt));
|
||||||
|
|
Loading…
Reference in New Issue