]>
Commit | Line | Data |
---|---|---|
be85a188 | 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 | |
4 | @@ -31,9 +31,14 @@ | |
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 , | |
13 | +where | |
14 | +.I maptype | |
15 | +is one of the supported map types (file, program, yp, nisplus, hesiod, userdir, ldap), and | |
16 | +.I mapname | |
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. | |
19 | ||
20 | The format of the map file and the options are described in | |
21 | .BR autofs (5). | |
22 | @@ -44,21 +49,27 @@ | |
23 | .nf | |
24 | /home /etc/auto.home | |
25 | /misc /etc/auto.misc | |
26 | +/mnt yp:mnt.map | |
27 | .fi | |
28 | .RE | |
29 | .sp | |
30 | -This will generate two mountpoints | |
31 | -.I /home | |
32 | +This will generate three mountpoints | |
33 | +.IR /home , | |
34 | +.IR /misc , | |
35 | and | |
36 | -.IR /misc . | |
37 | +.IR /mnt . | |
38 | All accesses to | |
39 | .I /home | |
40 | will lead to the consultation of the map in | |
41 | .IR /etc/auto.home , | |
42 | -and all accesses to | |
43 | +all accesses to | |
44 | .I /misc | |
45 | will consult the map in | |
46 | -.IR /etc/auto.misc . | |
47 | +.IR /etc/auto.misc , | |
48 | +and all accesses to | |
49 | +.I /mnt | |
50 | +will consult the NIS map | |
51 | +.IR mnt.map . | |
52 | .SH "SEE ALSO" | |
53 | .BR automount (8), | |
54 | .BR autofs (5), | |
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 | |
58 | @@ -3,5 +3,5 @@ | |
59 | # Format of this file: | |
60 | # mountpoint map options | |
61 | # For details of the format look at autofs(8). | |
62 | -/misc /etc/auto.misc | |
63 | -/net /etc/auto.net | |
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 | |
69 | @@ -3,8 +3,13 @@ | |
70 | # key [ -mount-options-separated-by-comma ] location | |
71 | # Details may be found in the autofs(5) manpage | |
72 | ||
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 | |
80 | + | |
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 |