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

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