summaryrefslogtreecommitdiff
path: root/sbin/mount/mount.8
diff options
context:
space:
mode:
authorClaudio Jeker <claudio@cvs.openbsd.org>2014-07-13 12:01:31 +0000
committerClaudio Jeker <claudio@cvs.openbsd.org>2014-07-13 12:01:31 +0000
commit0f3ccfdc7fe36a626b367626d16630a1f35cf717 (patch)
tree0da60b76ed920b6eeebd69cdd60d3f19578e40c3 /sbin/mount/mount.8
parent19b852373995f563f91473a2664c5e42dd187a32 (diff)
Introduce a -N option to mount and a 'net' mount option.
File systems marked with net will not be mounted by default. mount -a -N will mount all those file systems instead. This will be used to mark file systems needing network to work -- in other words which depend on iscsid. "Get it in" deraadt@
Diffstat (limited to 'sbin/mount/mount.8')
-rw-r--r--sbin/mount/mount.818
1 files changed, 16 insertions, 2 deletions
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index 1a1c0e5fadb..4226f019d8a 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mount.8,v 1.74 2014/06/24 02:32:43 daniel Exp $
+.\" $OpenBSD: mount.8,v 1.75 2014/07/13 12:01:30 claudio Exp $
.\" $NetBSD: mount.8,v 1.11 1995/07/12 06:23:21 cgd Exp $
.\"
.\" Copyright (c) 1980, 1989, 1991, 1993
@@ -30,7 +30,7 @@
.\"
.\" @(#)mount.8 8.7 (Berkeley) 3/27/94
.\"
-.Dd $Mdocdate: June 24 2014 $
+.Dd $Mdocdate: July 13 2014 $
.Dt MOUNT 8
.Os
.Sh NAME
@@ -118,6 +118,8 @@ to try to mount all of the file systems listed in the
.Xr fstab 5
table except those for which the
.Dq noauto
+or
+.Dq net
option is specified.
.It Fl a
Similar to the
@@ -145,6 +147,18 @@ command is trying to do.
Either force mounting of dirty file systems or, in the case of a
downgrade from read-write to read-only operation, the revocation of
opened files with write access.
+.It Fl N
+If used with either
+.Fl A
+or
+.Fl a ,
+.Xm
+will only look at file systems which have the
+.Dq net
+option specified.
+By default file systems with the
+.Dq net
+option are ignored.
.It Fl o Ar options
Options can be given with (or without) a
.Sq no