Skip to contentSkip to conversation

Fixes for samples/auto.master

PATCH In review Vincent McIntyre 2 participants 2 messages Mar 27, 2014 – Mar 28, 2014 Kernel automounter

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fixes for samples/auto.master

Hi,

I noticed that the preamble in samples/auto.master seemed to be referring to a regular autofs map, not a 'master' map. Perhaps this patch would clear that up?

Kind regards,
Vince

Signed-off-by <[email protected]>

Vincent McIntyre (2):
---
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'.

 man/auto.master.5.in |    2 +-
 samples/auto.master  |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)
samples/auto.master +4 -3
index 72f086c..0f2c8ab 100644
@@ -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
 #
Signature · 1 line
1.7.2.5
man/auto.master.5.in +1 -1
index 1d96d7e..1095406 100644
@@ -139,7 +139,7 @@ the \fBdn\fP of an LDAP entry for maps of type \fBldap\fP.
 .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
Signature · 1 line
1.7.2.5
maintainer
#1 lore raw
Quoted 5 lines · Vincent McIntyre

Hi,

I noticed that the preamble in samples/auto.master seemed to be referring to a regular autofs map, not a 'master' map. Perhaps this patch would clear that up?

Thanks, I'll add that to my patch queue for the next push.

Quoted 58 lines

Kind regards,
Vince

Signed-off-by <[email protected]>

Vincent McIntyre (2):
---
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'.

 man/auto.master.5.in |    2 +-
 samples/auto.master  |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)
samples/auto.master +4 -3
index 72f086c..0f2c8ab 100644
@@ -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
 #
Signature · 1 line
1.7.2.5
man/auto.master.5.in +1 -1
index 1d96d7e..1095406 100644
@@ -139,7 +139,7 @@ the \fBdn\fP of an LDAP entry for maps of type \fBldap\fP.
 .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