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