1 diff -uNr autofs-4.0.0pre7/man/auto.master.5 autofs-4.0.0pre7-redhat/man/auto.master.5
2 --- autofs-4.0.0pre7/man/auto.master.5 Tue Apr 18 05:54:44 2000
3 +++ autofs-4.0.0pre7-redhat/man/auto.master.5 Wed Apr 26 14:41:26 2000
5 The file has three fields separated by an arbitrary number of blanks or
6 tabs. Lines beginning with # are comments. The first field is the mount
7 point. Second field is the map file to be consulted for this mount-point.
8 -The third field is optional and can contain options to be applied to all
9 -entries in the map. Options are cumulative, which is a difference to the
10 -behavior of the SunOS automounter.
11 +This field is of the form
12 +.IR maptype:mapname ,
15 +is one of the supported map types (file, program, yp, nisplus, hesiod, userdir, ldap), and
17 +is the name of the map. The third field is optional and can contain options to+ be applied to all entries in the map. Options are cumulative, which is a
18 +difference from the behavior of the SunOS automounter.
20 The format of the map file and the options are described in
30 -This will generate two mountpoints
32 +This will generate three mountpoints
40 will lead to the consultation of the map in
45 will consult the map in
50 +will consult the NIS map
55 diff -uNr autofs-4.0.0pre7/samples/auto.master autofs-4.0.0pre7-redhat/samples/auto.master
56 --- autofs-4.0.0pre7/samples/auto.master Tue Apr 18 05:54:44 2000
57 +++ autofs-4.0.0pre7-redhat/samples/auto.master Wed Apr 26 14:42:27 2000
59 # Format of this file:
60 # mountpoint map options
61 # For details of the format look at autofs(8).
64 +/misc /etc/auto.misc --timeout=60
65 +/net /etc/auto.net --timeout=60
66 diff -uNr autofs-4.0.0pre7/samples/auto.misc autofs-4.0.0pre7-redhat/samples/auto.misc
67 --- autofs-4.0.0pre7/samples/auto.misc Tue Apr 18 05:54:44 2000
68 +++ autofs-4.0.0pre7-redhat/samples/auto.misc Wed Apr 26 14:41:26 2000
70 # key [ -mount-options-separated-by-comma ] location
71 # Details may be found in the autofs(5) manpage
73 -kernel -ro ftp.kernel.org:/pub/linux
74 -boot -fstype=ext2 :/dev/hda1
75 -removable -fstype=ext2 :/dev/hdd
76 -cd -fstype=iso9660,ro :/dev/hdc
77 -floppy -fstype=auto :/dev/fd0
78 +kernel -ro,soft,intr ftp.kernel.org:/pub/linux
79 +cd -fstype=iso9660,ro,nosuid,nodev :/dev/cdrom
81 +# the following entries are samples to pique your imagination
82 +#boot -fstype=ext2 :/dev/hda1
83 +#floppy -fstype=auto :/dev/fd0
84 +#floppy -fstype=ext2 :/dev/fd0
85 +#e2floppy -fstype=ext2 :/dev/fd0
86 +#jaz -fstype=ext2 :/dev/sdc1
87 +#removable -fstype=ext2 :/dev/hdd