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 d27d94b03fd690e6b5e73d533b787dcb33d9d378..09e65baf59ed789885c950edb3eb057c38af2372 100644 (file)
--- 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 353bd57be6e9767b358958166521af3e512dc74b..0b33f3b1190541868036f2c2af14f11d2ede01b1 100644 (file)
--- a/tests/t_dangerous/expect
+++ b/tests/t_dangerous/expect
@@ -11,7 +11,7 @@ Writing superblocks and filesystem accounting information:      \b\b\b\b\bdone
 
 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 2ee3c279c42b32193d76b0dea24e31a5252798c8..5a1a33a50f91c5c834c96496ced9360f91676d53 100644 (file)
--- 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 d3b444436f84ac007efc293e34b8a4b380b98ec0..ed4774c2dfa84e9890efab96a0742415471bc16d 100644 (file)
--- 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 2a6d705dc383e6d43d985f0418f781adb2a670e0..0ebf1626db14a802ea22c7d8dbdf6db1c9aca2bf 100644 (file)
--- 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.