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

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