From 91099dea357e06074a38f81758c055b5806c1b05 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 5 Sep 2019 16:46:14 +0200 Subject: [PATCH] tests: update sfdisk wipe output - stderr is used for the warning (like in fdisk) Signed-off-by: Karel Zak --- disk-utils/sfdisk.c | 2 +- tests/expected/sfdisk/wipe-fs-to-dos | 2 -- tests/expected/sfdisk/wipe-fs-to-dos.err | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c index 7032929134..deeb1dfe75 100644 --- a/disk-utils/sfdisk.c +++ b/disk-utils/sfdisk.c @@ -1476,7 +1476,7 @@ static void follow_wipe_mode(struct sfdisk *sf) if (dowipe) { if (!fdisk_is_ptcollision(sf->cxt)) { - fdisk_warn(sf->cxt, _( + fdisk_warnx(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)); diff --git a/tests/expected/sfdisk/wipe-fs-to-dos b/tests/expected/sfdisk/wipe-fs-to-dos index b9fab7a32a..317bbfb450 100644 --- a/tests/expected/sfdisk/wipe-fs-to-dos +++ b/tests/expected/sfdisk/wipe-fs-to-dos @@ -2,7 +2,6 @@ =====Create FS================================ =====Create DOS================================ -The old swap signature will be removed by a write command. Disk : 50 MiB, 52428800 bytes, 102400 sectors Disk model: scsi_debug @@ -11,7 +10,6 @@ Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / bytes >>> Created a new . -The old swap signature will be removed by a write command. 1: Created a new . 2: Done. diff --git a/tests/expected/sfdisk/wipe-fs-to-dos.err b/tests/expected/sfdisk/wipe-fs-to-dos.err index e69de29bb2..d0b1745304 100644 --- a/tests/expected/sfdisk/wipe-fs-to-dos.err +++ b/tests/expected/sfdisk/wipe-fs-to-dos.err @@ -0,0 +1,2 @@ +The device contains 'swap' signature and it will be removed by a write command. See sfdisk(8) man page and --wipe option for more details. +The device contains 'swap' signature and it will be removed by a write command. See sfdisk(8) man page and --wipe option for more details. -- 2.47.2