From a092c563f736963223029e03be28b2b83b54caf6 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Fri, 27 Jul 2001 22:40:09 -0400 Subject: [PATCH] Update problem message printed when special files have the immutable flag set. Update the f_filetype test case. --- e2fsck/ChangeLog | 2 ++ e2fsck/problem.c | 4 ++-- tests/ChangeLog | 5 +++++ tests/f_filetype/expect.1 | 15 +++++++++------ 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog index 5a77061..6ef2571 100644 --- a/e2fsck/ChangeLog +++ b/e2fsck/ChangeLog @@ -1,5 +1,7 @@ 2001-07-27 Theodore Tso + * problem.c (PR_1_SET_IMMUTABLE): Clarify problem message. + * pass1.c (e2fsck_pass1): Check for symlinks that have the immutable flag set (and offer to clear them). diff --git a/e2fsck/problem.c b/e2fsck/problem.c index dd215a1..cee69a9 100644 --- a/e2fsck/problem.c +++ b/e2fsck/problem.c @@ -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 */ diff --git a/tests/ChangeLog b/tests/ChangeLog index 3ccc1a18..15da8ac 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,8 @@ +2001-07-27 Theodore Tso + + * f_filetype: Update expect.1 to match changed problem message + text and the fact that symlinks shouldn't be immutable. + 2001-07-07 Theodore Tso * f_badinode: Update expect.1 to match change in invalid symlink diff --git a/tests/f_filetype/expect.1 b/tests/f_filetype/expect.1 index c56b809..a94560e 100644 --- a/tests/f_filetype/expect.1 +++ b/tests/f_filetype/expect.1 @@ -1,12 +1,15 @@ Pass 1: Checking inodes, blocks, and sizes -Special (device/socket/fifo) inode 14 has immutable or append-only flag set. -Clear? yes +Special (device/socket/fifo/symlink) file (inode 14) has immutable +or append-only flag set. Clear? yes -Special (device/socket/fifo) inode 15 has immutable or append-only flag set. -Clear? yes +Special (device/socket/fifo/symlink) file (inode 15) has immutable +or append-only flag set. Clear? yes -Special (device/socket/fifo) inode 16 has immutable or append-only flag set. -Clear? yes +Special (device/socket/fifo/symlink) file (inode 16) has immutable +or append-only flag set. Clear? yes + +Special (device/socket/fifo/symlink) file (inode 17) has immutable +or append-only flag set. Clear? yes Pass 2: Checking directory structure Setting filetype for entry '.' in / (2) to 2. -- 1.8.3.1