From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 1 Sep 2016 02:53:07 +0000 (-0400)
Subject: tune2fs: tell the user that e2fsck -f is required
X-Git-Tag: v1.43.2~14
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=4d4335323ea7d863ac2f907e7e90ae4d63c310bd;p=tools%2Fe2fsprogs.git

tune2fs: tell the user that e2fsck -f is required

The message requesting that the user run e2fsck doesn't include the -f
option, and this is needed to force a file system check.

Addresses-Debian-Bug: #828022

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index d27d94b..09e65ba 100644
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -116,9 +116,9 @@ struct blk_move {
 
 errcode_t ext2fs_run_ext3_journal(ext2_filsys *fs);
 
-static const char *please_fsck = N_("Please run e2fsck on the filesystem.\n");
+static const char *please_fsck = N_("Please run e2fsck -f on the filesystem.\n");
 static const char *please_dir_fsck =
-		N_("Please run e2fsck -D on the filesystem.\n");
+		N_("Please run e2fsck -fD on the filesystem.\n");
 
 #ifdef CONFIG_BUILD_FINDFS
 void do_findfs(int argc, char **argv);
diff --git a/tests/t_dangerous/expect b/tests/t_dangerous/expect
index 353bd57..0b33f3b 100644
--- a/tests/t_dangerous/expect
+++ b/tests/t_dangerous/expect
@@ -11,7 +11,7 @@ Writing superblocks and filesystem accounting information:      done
 
 tune2fs -O metadata_csum test.img
 
-Please run e2fsck on the filesystem.
+Please run e2fsck -f on the filesystem.
 
 Exit status is 1
 tune2fs -O metadata_csum test.img
@@ -57,7 +57,7 @@ Exit status is 0
 tune2fs -O metadata_csum test.img
 Enabling checksums could take some time.
 Proceed anyway (or wait 5 seconds) ? (y,n) 
-Please run e2fsck -D on the filesystem.
+Please run e2fsck -fD on the filesystem.
 
 Exit status is 0
 test_filesys was not cleanly unmounted, check forced.
diff --git a/tests/t_enable_mcsum/expect b/tests/t_enable_mcsum/expect
index 2ee3c27..5a1a33a 100644
--- a/tests/t_enable_mcsum/expect
+++ b/tests/t_enable_mcsum/expect
@@ -18,7 +18,7 @@ Pass 5: Checking group summary information
 Exit status is 0
 tune2fs -O metadata_csum test.img
 
-Please run e2fsck -D on the filesystem.
+Please run e2fsck -fD on the filesystem.
 
 Exit status is 0
 test_filesys was not cleanly unmounted, check forced.
diff --git a/tests/t_enable_mcsum_initbg/expect b/tests/t_enable_mcsum_initbg/expect
index d3b4444..ed4774c 100644
--- a/tests/t_enable_mcsum_initbg/expect
+++ b/tests/t_enable_mcsum_initbg/expect
@@ -18,7 +18,7 @@ Pass 5: Checking group summary information
 Exit status is 0
 tune2fs -O metadata_csum test.img
 
-Please run e2fsck -D on the filesystem.
+Please run e2fsck -fD on the filesystem.
 
 Exit status is 0
 test_filesys was not cleanly unmounted, check forced.
diff --git a/tests/t_iexpand_mcsum/expect b/tests/t_iexpand_mcsum/expect
index 2a6d705..0ebf162 100644
--- a/tests/t_iexpand_mcsum/expect
+++ b/tests/t_iexpand_mcsum/expect
@@ -19,7 +19,7 @@ Exit status is 0
 tune2fs -I 256 -O metadata_csum test.img
 Setting inode size 256
 
-Please run e2fsck -D on the filesystem.
+Please run e2fsck -fD on the filesystem.
 
 Exit status is 0
 Backing up journal inode block information.