aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Kent <raven@themaw.net>2021-05-24 13:34:14 +0800
committerIan Kent <raven@themaw.net>2021-07-07 10:28:54 +0800
commitb2be38b9984f31b81c496ec652ca10ed303d4b8a (patch)
treed6fcba7e8747ccada74d826e569b933db6a7fd57
parenta2440a33a7ecb6b318482235eb08e36a0cfb9394 (diff)
downloadautofs-b2be38b9984f31b81c496ec652ca10ed303d4b8a.tar.gz
autofs-5.1.7 - add missing desciption of null map option
The description of how the -null master map option behaves is mising from auto.master(5). Signed-off-by: Ian Kent <raven@themaw.net>
-rw-r--r--CHANGELOG1
-rw-r--r--man/auto.master.5.in19
2 files changed, 20 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index b29d2ed8..f5f0da76 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -76,6 +76,7 @@
- eliminate redundant cache lookup in tree_mapent_add_node().
- fix hosts map offset order.
- fix direct mount deadlock.
+- add missing description of null map option.
25/01/2021 autofs-5.1.7
- make bind mounts propagation slave by default.
diff --git a/man/auto.master.5.in b/man/auto.master.5.in
index 72fbfd23..16717015 100644
--- a/man/auto.master.5.in
+++ b/man/auto.master.5.in
@@ -265,6 +265,25 @@ accessing /net/myserver will mount exports from myserver on directories below
NOTE: mounts done from a hosts map will be mounted with the "nosuid,nodev" options
unless overridden by explicitly specifying the "suid", "dev" options in the
master map entry.
+.SH BUILTIN MAP \-null
+If "\-null" is given as the map it is used to tell automount(8) to ignore a subsequent
+master map entry with the given path.
+.P
+It can only be used for paths that appear in the master map (or in direct mount maps).
+.P
+An indirect mount map top level mount point path can be nulled. If so no mounts from
+the nulled mount are performed (essentially it isn't mounted).
+.P
+Direct mount map path entries can be nulled. Since they must be present at startup
+they are (notionally) part of the master map.
+.P
+A nulled master map entry path will ignore a single subsequent matching entry. Any
+matching entry following that will be treated as it normally would be. An example
+use of this is allowing local master map entries to override remote ones.
+.P
+NOTE: If a duplicate master map entry path is seen (excluding paths of null entries)
+it will be ignored and noted in the log, that is the first encountered master map
+entry is used unless there is a corresponding null entry.
.SH LDAP MAPS
If the map type \fBldap\fP is specified the mapname is of the form
\fB[//servername/]dn\fP, where the optional \fBservername\fP is