Module Name: src
Committed By: wiz
Date: Tue Jan 9 09:39:07 UTC 2018
Modified Files:
src/usr.sbin/autofs: automount.8 automountd.8 autounmountd.8
Log Message:
File system police. Sort options. Add RCS Id. Use more markup. Wording.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/autofs/automount.8 \
src/usr.sbin/autofs/automountd.8 src/usr.sbin/autofs/autounmountd.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/autofs/automount.8
diff -u src/usr.sbin/autofs/automount.8:1.1 src/usr.sbin/autofs/automount.8:1.2
--- src/usr.sbin/autofs/automount.8:1.1 Tue Jan 9 03:31:15 2018
+++ src/usr.sbin/autofs/automount.8 Tue Jan 9 09:39:07 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: automount.8,v 1.1 2018/01/09 03:31:15 christos Exp $
+.\" $NetBSD: automount.8,v 1.2 2018/01/09 09:39:07 wiz Exp $
.\" Copyright (c) 2017 The NetBSD Foundation, Inc.
.\" Copyright (c) 2016 The DragonFly Project
.\" Copyright (c) 2014 The FreeBSD Foundation
@@ -41,13 +41,9 @@
.Nd update autofs mounts
.Sh SYNOPSIS
.Nm
+.Op Fl cfLuv
.Op Fl D Ar name=value
-.Op Fl L
-.Op Fl c
-.Op Fl f
.Op Fl o Ar options
-.Op Fl v
-.Op Fl u
.Sh DESCRIPTION
When called without options, the
.Nm
@@ -56,13 +52,19 @@ command parses the
configuration file and any direct maps that it references, and mounts
or unmounts
.Xr autofs 5
-filesystems to match.
+file systems to match.
These options are available:
.Bl -tag -width ".Fl v"
+.It Fl c
+Flush caches, discarding possibly stale information obtained from maps
+and directory services.
.It Fl D
Define a variable.
It is only useful with
.Fl L .
+.It Fl f
+Force unmount, to be used with
+.Fl u .
.It Fl L
Do not mount or unmount anything.
Instead parse
@@ -71,23 +73,17 @@ and any direct maps, then print them to
When specified more than once, all the maps, including indirect ones,
will be parsed and shown.
This is useful when debugging configuration problems.
-.It Fl c
-Flush caches, discarding possibly stale information obtained from maps
-and directory services.
-.It Fl f
-Force unmount, to be used with
-.Fl u .
.It Fl o
Specify mount options to be used along with the ones specified in the maps.
It is only useful with
.Fl L .
.It Fl u
-Try to unmount filesystems mounted by
+Try to unmount file systems mounted by
.Xr automountd 8 .
.Xr autofs 5
mounts are not unmounted.
To unmount all
-.Xr autofs
+.Xr autofs 5
mounts, use
.Cm "umount -At autofs".
.It Fl v
@@ -96,12 +92,12 @@ Increase verbosity.
.Sh EXIT STATUS
.Ex -std
.Sh EXAMPLES
-Unmount all filesystems mounted by
+Unmount all file systems mounted by
.Xr automountd 8 :
.Dl Nm Fl u
.Sh SEE ALSO
-.Xr autofs 5 ,
.Xr auto_master 5 ,
+.Xr autofs 5 ,
.Xr automountd 8 ,
.Xr autounmountd 8
.Sh HISTORY
@@ -122,7 +118,9 @@ The
.Nm
was developed by
.An Edward Tomasz Napierala Aq Mt [email protected]
-under sponsorship from the FreeBSD Foundation.
+under sponsorship from the
+.Fx
+Foundation.
.Pp
The
.Nm
Index: src/usr.sbin/autofs/automountd.8
diff -u src/usr.sbin/autofs/automountd.8:1.1 src/usr.sbin/autofs/automountd.8:1.2
--- src/usr.sbin/autofs/automountd.8:1.1 Tue Jan 9 03:31:15 2018
+++ src/usr.sbin/autofs/automountd.8 Tue Jan 9 09:39:07 2018
@@ -1,3 +1,5 @@
+.\" $NetBSD: automountd.8,v 1.2 2018/01/09 09:39:07 wiz Exp $
+.\"
.\" Copyright (c) 2017 The NetBSD Foundation, Inc.
.\" Copyright (c) 2016 The DragonFly Project
.\" Copyright (c) 2014 The FreeBSD Foundation
@@ -40,31 +42,31 @@
.Nd daemon handling autofs mount requests
.Sh SYNOPSIS
.Nm
+.Op Fl div
.Op Fl D Ar name=value
-.Op Fl i
.Op Fl m Ar maxproc
.Op Fl o Ar options
-.Op Fl d
-.Op Fl v
.Sh DESCRIPTION
The
.Nm
daemon is responsible for handling
.Xr autofs 5
mount requests, parsing maps,
-and mounting filesystems they specify.
+and mounting file systems they specify.
On startup,
.Nm
forks into background and waits for kernel requests.
When a request is received,
.Nm
forks a child process.
-The child process parses the appropriate map and mounts filesystems accordingly.
+The child process parses the appropriate map and mounts file systems accordingly.
Then it signals the kernel to release blocked processes that were waiting
for the mount.
.Bl -tag -width ".Fl v"
.It Fl D
Define a variable.
+.It Fl d
+Debug mode: increase verbosity and do not daemonize.
.It Fl i
For indirect mounts, only create subdirectories if there are no wildcard
entries.
@@ -79,8 +81,6 @@ Limit the number of forked
.Nm
processes, and thus the number of mount requests being handled in parallel.
The default is 30.
-.It Fl d
-Debug mode: increase verbosity and do not daemonize.
.It Fl o Ar options
Specify mount options.
Options specified here will be overridden by options entered in maps or
@@ -91,9 +91,8 @@ Increase verbosity.
.Sh EXIT STATUS
.Ex -std
.Sh SEE ALSO
-.Xr autofs 5 ,
.Xr auto_master 5 ,
-.Xr hammer 5 ,
+.Xr autofs 5 ,
.Xr automount 8 ,
.Xr autounmountd 8
.Sh HISTORY
@@ -114,9 +113,10 @@ The
.Nm
was developed by
.An Edward Tomasz Napierala Aq Mt [email protected]
-under sponsorship from the FreeBSD Foundation.
+under sponsorship from the
+.Fx
+Foundation.
.Pp
-The
.Nm
was ported to
.Dx
Index: src/usr.sbin/autofs/autounmountd.8
diff -u src/usr.sbin/autofs/autounmountd.8:1.1 src/usr.sbin/autofs/autounmountd.8:1.2
--- src/usr.sbin/autofs/autounmountd.8:1.1 Tue Jan 9 03:31:15 2018
+++ src/usr.sbin/autofs/autounmountd.8 Tue Jan 9 09:39:07 2018
@@ -1,3 +1,5 @@
+.\" $NetBSD: autounmountd.8,v 1.2 2018/01/09 09:39:07 wiz Exp $
+.\"
.\" Copyright (c) 2017 The NetBSD Foundation, Inc.
.\" Copyright (c) 2016 The DragonFly Project
.\" Copyright (c) 2014 The FreeBSD Foundation
@@ -37,38 +39,37 @@
.Os
.Sh NAME
.Nm autounmountd
-.Nd daemon unmounting automounted filesystems
+.Nd daemon unmounting automounted file systems
.Sh SYNOPSIS
.Nm
-.Op Fl d
.Op Fl r Ar time
.Op Fl t Ar time
-.Op Fl v
+.Op Fl dv
.Sh DESCRIPTION
The
.Nm
-daemon is responsible for unmounting filesystems mounted by
+daemon is responsible for unmounting file systems mounted by
.Xr automountd 8 .
On startup,
.Nm
-retrieves a list of filesystems that have the
+retrieves a list of file systems that have the
.Li automounted
mount option set.
-The list is updated every time a filesystem is mounted or unmounted.
+The list is updated every time a file system is mounted or unmounted.
After a specified time passes,
.Nm
-attempts to unmount a filesystem, retrying after some time if necessary.
+attempts to unmount a file system, retrying after some time if necessary.
.Pp
These options are available:
.Bl -tag -width ".Fl v"
.It Fl d
Debug mode: increase verbosity and do not daemonize.
.It Fl r
-Number of seconds to wait before trying to unmount an expired filesystem
-after a previous attempt failed, possibly due to filesystem being busy.
+Number of seconds to wait before trying to unmount an expired file system
+after a previous attempt failed, possibly due to file system being busy.
The default value is 600, or ten minutes.
.It Fl t
-Number of seconds to wait before trying to unmount a filesystem.
+Number of seconds to wait before trying to unmount a file system.
The default value is 600, or ten minutes.
.It Fl v
Increase verbosity.
@@ -76,8 +77,8 @@ Increase verbosity.
.Sh EXIT STATUS
.Ex -std
.Sh SEE ALSO
-.Xr autofs 5 ,
.Xr auto_master 5 ,
+.Xr autofs 5 ,
.Xr automount 8 ,
.Xr automountd 8
.Sh HISTORY
@@ -98,9 +99,10 @@ The
.Nm
was developed by
.An Edward Tomasz Napierala Aq Mt [email protected]
-under sponsorship from the FreeBSD Foundation.
+under sponsorship from the
+.Fx
+Foundation.
.Pp
-The
.Nm
was ported to
.Dx
