diff options
authorTheodore Ts'o <tytso@mit.edu>2005-12-09 17:28:56 -0500
committerTheodore Ts'o <tytso@mit.edu>2005-12-09 17:28:56 -0500
commit84d3518bb9e5e601aeda19c79c02b669615a886b (patch)
parent125e084cef02fe865a34181ccfa7f258ccf8ab34 (diff)
Clarify description of the -p, -n, and -y options in the e2fsck man page.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2 files changed, 34 insertions, 3 deletions
diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index b7da9b6d..f445784f 100644
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-09 Theodore Ts'o <tytso@mit.edu>
+ * e2fsck.8.in: Clarify description of differences between the -p,
+ -n, and -y options.
2005-09-24 Theodore Ts'o <tytso@mit.edu>
* super.c (check_super_block), problem.c, problem.h: Detect if the
diff --git a/e2fsck/e2fsck.8.in b/e2fsck/e2fsck.8.in
index cf4eebf6..40a9358a 100644
--- a/e2fsck/e2fsck.8.in
+++ b/e2fsck/e2fsck.8.in
@@ -226,10 +226,31 @@ options are specified in addition to the
.B \-n
option, then the filesystem will be opened read-write, to permit the
bad-blocks list to be updated. However, no other changes will be made
-to the filesystem.)
+to the filesystem.) This option
+may not be specified at the same time as the
+.B \-p
+.B \-y
.B \-p
-Automatically repair ("preen") the file system without any questions.
+Automatically repair ("preen") the file system. This option will case
+.B e2fsck
+to automatically
+fix any filesystem problems that can be safely fixed without human
+intervention. If
+.B e2fsck
+discovers a problem which may require the system administrator
+to take additional corrective action,
+.B e2fsck
+will print a description of the problem and then exit with the value 4
+logically or'ed into the exit code. (See the \fBEXIT CODE\fR section.)
+This option is normally used by the system's boot scripts. It may not
+be specified at the same time as the
+.B \-n
+.B \-y
.B \-r
This option does nothing at all; it is provided only for backwards
@@ -261,7 +282,12 @@ Print version information and exit.
.B \-y
Assume an answer of `yes' to all questions; allows
.B e2fsck
-to be used non-interactively.
+to be used non-interactively. This option
+may not be specified at the same time as the
+.B \-n
+.B \-p
The exit code returned by
.B e2fsck