Blame SOURCES/autofs-5.1.7-add-missing-description-of-null-map-option.patch

b8be1a
autofs-5.1.7 - add missing desciption of null map option
b8be1a
b8be1a
From: Ian Kent <raven@themaw.net>
b8be1a
b8be1a
The description of how the -null master map option behaves is
b8be1a
mising from auto.master(5).
b8be1a
b8be1a
Signed-off-by: Ian Kent <raven@themaw.net>
b8be1a
---
b8be1a
 CHANGELOG            |    1 +
b8be1a
 man/auto.master.5.in |   19 +++++++++++++++++++
b8be1a
 2 files changed, 20 insertions(+)
b8be1a
b8be1a
--- autofs-5.1.4.orig/CHANGELOG
b8be1a
+++ autofs-5.1.4/CHANGELOG
b8be1a
@@ -74,6 +74,7 @@
b8be1a
 - fix hosts map offset order.
b8be1a
 - fix direct mount deadlock.
b8be1a
 - fix lookup_prune_one_cache() refactoring change.
b8be1a
+- add missing description of null map option.
b8be1a
 
b8be1a
 xx/xx/2018 autofs-5.1.5
b8be1a
 - fix flag file permission.
b8be1a
--- autofs-5.1.4.orig/man/auto.master.5.in
b8be1a
+++ autofs-5.1.4/man/auto.master.5.in
b8be1a
@@ -263,6 +263,25 @@ accessing /net/myserver will mount expor
b8be1a
 NOTE: mounts done from a hosts map will be mounted with the "nosuid,nodev,intr" options
b8be1a
 unless overridden by explicitly specifying the "suid", "dev" or "nointr" options in the
b8be1a
 master map entry.
b8be1a
+.SH BUILTIN MAP \-null
b8be1a
+If "\-null" is given as the map it is used to tell automount(8) to ignore a subsequent
b8be1a
+master map entry with the given path.
b8be1a
+.P
b8be1a
+It can only be used for paths that appear in the master map (or in direct mount maps).
b8be1a
+.P
b8be1a
+An indirect mount map top level mount point path can be nulled. If so no mounts from
b8be1a
+the nulled mount are performed (essentially it isn't mounted).
b8be1a
+.P
b8be1a
+Direct mount map path entries can be nulled. Since they must be present at startup
b8be1a
+they are (notionally) part of the master map.
b8be1a
+.P
b8be1a
+A nulled master map entry path will ignore a single subsequent matching entry. Any
b8be1a
+matching entry following that will be treated as it normally would be. An example
b8be1a
+use of this is allowing local master map entries to override remote ones.
b8be1a
+.P
b8be1a
+NOTE: If a duplicate master map entry path is seen (excluding paths of null entries)
b8be1a
+it will be ignored and noted in the log, that is the first encountered master map
b8be1a
+entry is used unless there is a corresponding null entry.
b8be1a
 .SH LDAP MAPS
b8be1a
 If the map type \fBldap\fP is specified the mapname is of the form
b8be1a
 \fB[//servername/]dn\fP, where the optional \fBservername\fP is