summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sbin/fsck/fsck.831
-rw-r--r--sbin/fsck/fsck.c6
2 files changed, 25 insertions, 12 deletions
diff --git a/sbin/fsck/fsck.8 b/sbin/fsck/fsck.8
index 749787f4081..86ded4975e4 100644
--- a/sbin/fsck/fsck.8
+++ b/sbin/fsck/fsck.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fsck.8,v 1.21 2003/03/06 09:47:18 hugh Exp $
+.\" $OpenBSD: fsck.8,v 1.22 2004/07/28 21:17:22 jmc Exp $
.\" $NetBSD: fsck.8,v 1.14 1996/10/03 20:08:29 christos Exp $
.\"
.\" Copyright (c) 1996 Christos Zoulas. All rights reserved.
@@ -36,11 +36,17 @@
.Nd filesystem consistency check and interactive repair
.Sh SYNOPSIS
.Nm fsck
-.Op Fl dvpfny
+.Bk -words
+.Op Fl dfnpvy
.Op Fl l Ar maxparallel
+.Oo Xo
+.Fl T
+.Ar fstype Ns : Ns Ar fsoptions
+.Oc
+.Xc
.Op Fl t Ar fstype
-.Op Fl T Ar fstype:fsoptions
.Ar special | node ...
+.Ek
.Sh DESCRIPTION
The
.Nm
@@ -77,11 +83,22 @@ This is assumed to be the default when dealing with filesystems currently
mounted writeable.
.It Fl p
Enter preen mode.
+.It Xo
+.Fl T
+.Ar fstype Ns : Ns Ar fsoptions
+.Xc
+List of comma separated filesystem specific options for the specified
+filesystem type, in the same format as
+.Xr mount 8 .
.It Fl t Ar fstype
-Invoke fsck only in the comma separated list of filesystem types.
+Invoke
+.Nm
+only in the comma separated list of filesystem types.
If the list starts with
.Dq no ,
-invoke fsck only in the filesystem types that are
+invoke
+.Nm
+only in the filesystem types that are
.Em not
specified in
the list.
@@ -93,10 +110,6 @@ Cause
to assume
.Dq yes
as the answer to all operator questions.
-.It Fl T Ar fstype:fsoptions
-List of comma separated filesystem specific options for the specified
-filesystem type, in the same format as
-.Xr mount 8 .
.El
.Sh FILES
.Bl -tag -width /etc/fstab -compact
diff --git a/sbin/fsck/fsck.c b/sbin/fsck/fsck.c
index 3d2f3d3719c..a226a5643eb 100644
--- a/sbin/fsck/fsck.c
+++ b/sbin/fsck/fsck.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fsck.c,v 1.17 2004/01/13 15:59:13 otto Exp $ */
+/* $OpenBSD: fsck.c,v 1.18 2004/07/28 21:17:22 jmc Exp $ */
/* $NetBSD: fsck.c,v 1.7 1996/10/03 20:06:30 christos Exp $ */
/*
@@ -35,7 +35,7 @@
*
*/
-static const char rcsid[] = "$OpenBSD: fsck.c,v 1.17 2004/01/13 15:59:13 otto Exp $";
+static const char rcsid[] = "$OpenBSD: fsck.c,v 1.18 2004/07/28 21:17:22 jmc Exp $";
#include <sys/param.h>
#include <sys/mount.h>
@@ -465,7 +465,7 @@ usage(void)
{
extern char *__progname;
static const char common[] =
- "[-dvpfny] [-l maxparallel] [-t fstype] [-T fstype:fsoptions]";
+ "[-dfnpvy] [-l maxparallel] [-T fstype:fsoptions] [-t fstype]";
(void)fprintf(stderr, "Usage: %s %s special | node ...\n",
__progname, common);