|
 |
306fa1 |
autofs-5.0.8 - fixes for samples/auto.master
|
|
|
306fa1 |
|
|
|
306fa1 |
From: Vincent McIntyre <vincent.mcintyre@csiro.au>
|
|
|
306fa1 |
|
|
|
306fa1 |
Replace description that described regular automount maps, not
|
|
|
306fa1 |
master maps. Add a note about the format of included files.
|
|
|
306fa1 |
Clarify what happens to master map options not consumed by
|
|
|
306fa1 |
'mount'.
|
|
|
306fa1 |
|
|
|
306fa1 |
Signed-off-by: <vincent.mcintyre@csiro.au>
|
|
|
306fa1 |
---
|
|
|
306fa1 |
CHANGELOG | 1 +
|
|
|
306fa1 |
man/auto.master.5.in | 2 +-
|
|
|
306fa1 |
samples/auto.master | 7 ++++---
|
|
|
306fa1 |
3 files changed, 6 insertions(+), 4 deletions(-)
|
|
|
306fa1 |
|
|
|
306fa1 |
--- autofs-5.0.7.orig/CHANGELOG
|
|
|
306fa1 |
+++ autofs-5.0.7/CHANGELOG
|
|
|
306fa1 |
@@ -100,6 +100,7 @@
|
|
|
306fa1 |
- dont ignore null cache entries on multi mount umount.
|
|
|
306fa1 |
- fix inconsistent error returns in handle_packet_missing_direct().
|
|
|
306fa1 |
- simple coverity fixes.
|
|
|
306fa1 |
+- fixes for samples/auto.master.
|
|
|
306fa1 |
|
|
|
306fa1 |
25/07/2012 autofs-5.0.7
|
|
|
306fa1 |
=======================
|
|
|
306fa1 |
--- autofs-5.0.7.orig/man/auto.master.5.in
|
|
|
306fa1 |
+++ autofs-5.0.7/man/auto.master.5.in
|
|
|
306fa1 |
@@ -139,7 +139,7 @@ the \fBdn\fP of an LDAP entry for maps o
|
|
|
306fa1 |
.br
|
|
|
306fa1 |
Any remaining command line arguments without leading dashes (\-) are
|
|
|
306fa1 |
taken as options (\fI\-o\fP) to \fBmount\fP. Arguments with leading
|
|
|
306fa1 |
-dashes are considered options for the maps.
|
|
|
306fa1 |
+dashes are considered options for the maps and are passed to automount (8).
|
|
|
306fa1 |
.sp
|
|
|
306fa1 |
The \fBsun\fP format supports the following options:
|
|
|
306fa1 |
.RS
|
|
|
306fa1 |
--- autofs-5.0.7.orig/samples/auto.master
|
|
|
306fa1 |
+++ autofs-5.0.7/samples/auto.master
|
|
|
306fa1 |
@@ -1,8 +1,8 @@
|
|
|
306fa1 |
#
|
|
|
306fa1 |
# Sample auto.master file
|
|
|
306fa1 |
-# This is an automounter map and it has the following format
|
|
|
306fa1 |
-# key [ -mount-options-separated-by-comma ] location
|
|
|
306fa1 |
-# For details of the format look at autofs(5).
|
|
|
306fa1 |
+# This is a 'master' automounter map and it has the following format:
|
|
|
306fa1 |
+# mount-point [map-type[,format]:]map [options]
|
|
|
306fa1 |
+# For details of the format look at auto.master(5).
|
|
|
306fa1 |
#
|
|
|
306fa1 |
/misc /etc/auto.misc
|
|
|
306fa1 |
#
|
|
|
306fa1 |
@@ -13,6 +13,7 @@
|
|
|
306fa1 |
/net -hosts
|
|
|
306fa1 |
#
|
|
|
306fa1 |
# Include /etc/auto.master.d/*.autofs
|
|
|
306fa1 |
+# The included files must conform to the format of this file.
|
|
|
306fa1 |
#
|
|
|
306fa1 |
+dir:/etc/auto.master.d
|
|
|
306fa1 |
#
|