On Fri, 2019-03-15 at 02:57 +0000, Vincent.Mcintyre@xxxxxxxx wrote: > v2: fixed inconsistent naming (extra.autofs instead of foo.autofs) > > I've noticed people have difficulty fully parsing the rather terse > description in samples/auto.master, eg bugs.debian.org/693782. > Give a specific example of the usage to make understanding easier. > > Signed-off-by: Vincent McIntyre <vincent.mcintyre@xxxxxxxx> > > diff --git a/man/auto.master.5.in b/man/auto.master.5.in > index 68242d4..a9dae21 100644 > --- a/man/auto.master.5.in > +++ b/man/auto.master.5.in > @@ -383,6 +383,20 @@ All accesses to paths in the map > will trigger mounts when they are accessed and the Name Service Switch > configuration will be used to locate the source of the map > .IR auto.data . > +.sp > +To avoid making edits to @@autofsmapdir@@/auto.master, It's been a while since the patches that implemented this were contributed but it looks like the files containing the master map fragments can be any name you like. However, I think we should stick with the convention of the documentation saying you need to use *.autofs. I'll add a comment to this effect to the chnagelog entry. Plus included maps are only allowed in file based maps which I thought was mentioned in auto.master(5) but it isn't. I'll need to fix that. > +@@autofsmapdir@@/auto.master.d may be used. > +Files in that directory must have a ".autofs" suffix, e.g. > +.IR @@autofsmapdir@@/auto.master.d/extra.autofs. > +Such files contain lines of the same format as the auto.master file, e.g. > +.sp > +.RS +.2i > +.ta 1.0i > +.nf > +/foo /etc/auto.foo > +/baz yp:baz.map > +.fi > +.RE > .SH "SEE ALSO" > .BR automount (8), > .BR autofs (5), > diff --git a/samples/auto.master b/samples/auto.master > index 9a9968a..5483e3c 100644 > --- a/samples/auto.master > +++ b/samples/auto.master > @@ -13,7 +13,11 @@ > /net -hosts > # > # Include /etc/auto.master.d/*.autofs > -# The included files must conform to the format of this file. > +# To add an extra map using this mechanism you will need to add > +# two configuration items - one /etc/auto.master.d/extra.autofs file > +# (using the same line format as the auto.master file) > +# and a separate mount map (e.g. /etc/auto.extra or an auto.extra NIS map) > +# that is referred to by the extra.autofs file. > # > +dir:/etc/auto.master.d > #
