X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=e2fsck%2Fproblem.c;h=cee69a9deaefc223026d638816e785bc3690329f;hb=6d222f3217b11c9b27f92b4aafe47bfeb59b81fa;hp=2ded448a2fb0e69284375fdd82d9ae4d3dd7648e;hpb=55fd07ed0a5f4ed3dcc770526ee1ad3be967ac98;p=tools%2Fe2fsprogs.git

diff --git a/e2fsck/problem.c b/e2fsck/problem.c
index 2ded448..cee69a9 100644
--- a/e2fsck/problem.c
+++ b/e2fsck/problem.c
@@ -179,25 +179,25 @@ static const struct e2fsck_problem problem_table[] = {
 	  N_("@S has a bad ext3 @j (@i %i).\n"),
 	  PROMPT_CLEAR, PR_PREEN_OK },
 
-	/* Superblock has a journal device (which we can't handle yet) */
-	{ PR_0_JOURNAL_UNSUPP_DEV,
-	  N_("@S has external ext3 @j @v (unsupported).\n"),
-	  PROMPT_ABORT, PR_NO_OK | PR_AFTER_CODE, PR_0_JOURNAL_BAD_DEV },
-
-	/* Superblock has a bad journal device */
-	{ PR_0_JOURNAL_BAD_DEV,
-	  N_("@S has a bad ext3 @j (@v %X).\n"),
-	  PROMPT_CLEAR, PR_PREEN_OK },
+	/* The external journal has (unsupported) multiple filesystems */
+	{ PR_0_JOURNAL_UNSUPP_MULTIFS,
+	  N_("External @j has multiple @f users (unsupported).\n"),
+	  PROMPT_NONE, PR_FATAL },
+
+	/* Can't find external journal */
+	{ PR_0_CANT_FIND_JOURNAL,
+	  N_("Can't find external @j\n"),
+	  PROMPT_NONE, PR_FATAL },
 
-	/* Superblock has a journal UUID (which we can't handle yet) */
-	{ PR_0_JOURNAL_UNSUPP_UUID,
-	  N_("@S has an ext3 @j UUID (unsupported).\n"),
-	  PROMPT_ABORT, PR_NO_OK | PR_AFTER_CODE, PR_0_JOURNAL_BAD_UUID },
+	/* External journal has bad superblock */
+	{ PR_0_EXT_JOURNAL_BAD_SUPER,
+	  N_("External @j has bad @S\n"),
+	  PROMPT_NONE, PR_FATAL },
 
 	/* Superblock has a bad journal UUID */
 	{ PR_0_JOURNAL_BAD_UUID,
-	  N_("@S has a bad ext3 @j (UUID %s).\n"),
-	  PROMPT_CLEAR, PR_PREEN_OK },
+	  N_("External @j does not support this @f\n"),
+	  PROMPT_NONE, PR_FATAL },
 
 	/* Journal has an unknown superblock type */
 	{ PR_0_JOURNAL_UNSUPP_SUPER,
@@ -527,8 +527,8 @@ static const struct e2fsck_problem problem_table[] = {
 
 	/* Immutable flag set on a device or socket inode */
 	{ PR_1_SET_IMMUTABLE,
-	  N_("Special (@v/socket/fifo) @i %i has immutable or "
-	     "append-only flag set.\n"),
+	  N_("Special (@v/socket/fifo/symlink) file (@i %i) has immutable\n"
+	     "or append-only flag set.  "),
 	  PROMPT_CLEAR, PR_PREEN_OK | PR_PREEN_NO | PR_NO_OK },
 
 	/* Compression flag set on an inode when filesystem doesn't support it */
@@ -610,7 +610,7 @@ static const struct e2fsck_problem problem_table[] = {
 	/* Error EA allocation collision */
 	{ PR_1_EA_ALLOC_COLLISION,
 	  N_("@a @b %b is corrupt (allocation collision).  "),
-	  PROMPT_ABORT, 0},
+	  PROMPT_CLEAR, 0},
 	
 	/* Bad extended attribute name */
 	{ PR_1_EA_BAD_NAME,