From 57fd20366213c335b50a0f1e18311ff669216ac9 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Tue, 31 Jan 2017 16:17:15 -0500 Subject: [PATCH] tune2fs, mke2fs: use "Proceed (y, N)" so the default is clear Addresses-Debian-Bug: #852727 Signed-off-by: Theodore Ts'o --- misc/util.c | 4 ++-- tests/t_dangerous/expect | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/misc/util.c b/misc/util.c index fabc9d1..0ff3d49 100644 --- a/misc/util.c +++ b/misc/util.c @@ -101,11 +101,11 @@ void proceed_question(int delay) return; } signal(SIGALRM, alarm_signal); - printf(_("Proceed anyway (or wait %d seconds) ? (y,n) "), + printf(_("Proceed anyway (or wait %d seconds) ? (y,N) "), delay); alarm(delay); } else - fputs(_("Proceed anyway? (y,n) "), stdout); + fputs(_("Proceed anyway? (y,N) "), stdout); buf[0] = 0; if (!fgets(buf, sizeof(buf), stdin) || strchr(short_yes, buf[0]) == 0) { diff --git a/tests/t_dangerous/expect b/tests/t_dangerous/expect index 0b33f3b..bae7e0e 100644 --- a/tests/t_dangerous/expect +++ b/tests/t_dangerous/expect @@ -35,15 +35,15 @@ Pass 5: Checking group summary information Exit status is 0 tune2fs -O metadata_csum test.img Enabling checksums could take some time. -Proceed anyway (or wait 5 seconds) ? (y,n) +Proceed anyway (or wait 5 seconds) ? (y,N) Exit status is 1 tune2fs -I 512 test.img Resizing inodes could take some time. -Proceed anyway (or wait 5 seconds) ? (y,n) +Proceed anyway (or wait 5 seconds) ? (y,N) Exit status is 1 tune2fs -U random test.img Setting UUID on a checksummed filesystem could take some time. -Proceed anyway (or wait 5 seconds) ? (y,n) +Proceed anyway (or wait 5 seconds) ? (y,N) Exit status is 1 Change in FS metadata: @@ -56,7 +56,7 @@ Pass 5: Checking group summary information Exit status is 0 tune2fs -O metadata_csum test.img Enabling checksums could take some time. -Proceed anyway (or wait 5 seconds) ? (y,n) +Proceed anyway (or wait 5 seconds) ? (y,N) Please run e2fsck -fD on the filesystem. Exit status is 0 @@ -72,11 +72,11 @@ Pass 5: Checking group summary information tune2fs -I 512 test.img Resizing inodes could take some time. -Proceed anyway (or wait 5 seconds) ? (y,n) Setting inode size 512 +Proceed anyway (or wait 5 seconds) ? (y,N) Setting inode size 512 Exit status is 0 tune2fs -U f0f0f0f0-f0f0-f0f0-f0f0-f0f0f0f0f0f0 test.img Setting UUID on a checksummed filesystem could take some time. -Proceed anyway (or wait 5 seconds) ? (y,n) Exit status is 0 +Proceed anyway (or wait 5 seconds) ? (y,N) Exit status is 0 Backing up journal inode block information. -- 1.8.3.1