Blame SOURCES/autofs-5.0.7-document-allowed-map-sources-in-auto_master.patch

306fa1
autofs-5.0.7 - document allowed map sources in auto.master
306fa1
306fa1
From: Ian Kent <raven@themaw.net>
306fa1
306fa1
Direct map may have multiple map sources but indirect maps may have
306fa1
only one map source.
306fa1
---
306fa1
 CHANGELOG            |    1 +
306fa1
 man/auto.master.5.in |    7 +++++--
306fa1
 2 files changed, 6 insertions(+), 2 deletions(-)
306fa1
306fa1
diff --git a/CHANGELOG b/CHANGELOG
306fa1
index 4576d47..61edddf 100644
306fa1
--- a/CHANGELOG
306fa1
+++ b/CHANGELOG
306fa1
@@ -41,6 +41,7 @@
306fa1
 - syncronize handle_mounts() shutdown.
306fa1
 - fix submount tree not all expiring.
306fa1
 - make dump maps check for duplicate indirect mounts.
306fa1
+- document allowed map sources in auto.master.
306fa1
 
306fa1
 25/07/2012 autofs-5.0.7
306fa1
 =======================
306fa1
diff --git a/man/auto.master.5.in b/man/auto.master.5.in
306fa1
index c552e56..7907ffa 100644
306fa1
--- a/man/auto.master.5.in
306fa1
+++ b/man/auto.master.5.in
306fa1
@@ -40,7 +40,8 @@ For direct maps the mount point is always specified as:
306fa1
 .P
306fa1
 /-
306fa1
 .P
306fa1
-and the key used within the direct map is the full path to the mount point.
306fa1
+and the key used within the direct map is the full path to the mount point. The direct map
306fa1
+may have multiple entries in the master map.
306fa1
 .P
306fa1
 For indirect maps access is by using the path scheme:
306fa1
 .P
306fa1
@@ -60,7 +61,9 @@ present in the master map by including a line of the form:
306fa1
 and 
306fa1
 .BR automount (8)
306fa1
 will process the map according to the specification described below for
306fa1
-map entries.
306fa1
+map entries. Indirect map entries must be unique in the master map so
306fa1
+second and subsequent entries for an indirect mount point are ignored by
306fa1
+.BR automount (8).
306fa1
 .SH "FORMAT"
306fa1
 Master map entries have three fields separated by an arbitrary number
306fa1
 of spaces or tabs. Lines beginning with # are comments. The first field