52 lines
2.1 KiB
Diff
52 lines
2.1 KiB
Diff
autofs-5.1.7 - add missing desciption of null map option
|
|
|
|
From: Ian Kent <raven@themaw.net>
|
|
|
|
The description of how the -null master map option behaves is
|
|
mising from auto.master(5).
|
|
|
|
Signed-off-by: Ian Kent <raven@themaw.net>
|
|
---
|
|
CHANGELOG | 1 +
|
|
man/auto.master.5.in | 19 +++++++++++++++++++
|
|
2 files changed, 20 insertions(+)
|
|
|
|
--- autofs-5.1.4.orig/CHANGELOG
|
|
+++ autofs-5.1.4/CHANGELOG
|
|
@@ -74,6 +74,7 @@
|
|
- fix hosts map offset order.
|
|
- fix direct mount deadlock.
|
|
- fix lookup_prune_one_cache() refactoring change.
|
|
+- add missing description of null map option.
|
|
|
|
xx/xx/2018 autofs-5.1.5
|
|
- fix flag file permission.
|
|
--- autofs-5.1.4.orig/man/auto.master.5.in
|
|
+++ autofs-5.1.4/man/auto.master.5.in
|
|
@@ -263,6 +263,25 @@ accessing /net/myserver will mount expor
|
|
NOTE: mounts done from a hosts map will be mounted with the "nosuid,nodev,intr" options
|
|
unless overridden by explicitly specifying the "suid", "dev" or "nointr" 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
|