- autofs.conf: update

skel-root/general/autofs/etc/autofs.conf

@@ -7,18 +7,31 @@
 #
 #master_map_name = auto.master
 #
-# timeout - set the default mount timeout in secons. The internal
+# timeout - set the default mount timeout in seconds. The internal
 #	    program default is 10 minutes, but the default installed
 #	    configuration overrides this and sets the timeout to 5
 #	    minutes to be consistent with earlier autofs releases.
 #
-timeout = 600
+timeout = 300
+#
+# master_wait - set the default maximum time to wait for the
+# 		master map to become available if it cannot
+# 		be read at program start (default 10, wait
+# 		for 10 seconds then continue).
+#
+#master_wait = 10
 #
 # negative_timeout - set the default negative timeout for
 # 		     failed mount attempts (default 60).
 #
 #negative_timeout = 60
 #
+# mount_verbose - use the -v flag when calling mount(8) and log some
+#		  process information about the requestor and its
+#		  parent.
+#
+#mount_verbose = no
+#
 # mount_wait - time to wait for a response from mount(8).
 # 	       Setting this timeout can cause problems when
 # 	       mount would otherwise wait for a server that
@@ -37,10 +50,14 @@ mount_wait = 5
 #
 browse_mode = yes
 #
-# mount_nfs_default_protocol - specify the default protocol used by
+# mount_nfs_default_protocol - set the default protocol that mount.nfs(8)
-# 			       mount.nfs(8). Since we can't identify
+#			       uses when performing a mount. Autofs needs
-# 			       the default automatically we need to
+#			       to know the default NFS protocol that
-# 			       set it in our configuration.
+#			       mount.nfs(8) uses so it can do special case
+#			       handling for its availability probe for
+#			       different NFS protocols. Since we can't
+#			       identify the default automatically we need
+#			       to set it in our configuration.
 #
 #mount_nfs_default_protocol = 3
 #
@@ -53,17 +70,24 @@ browse_mode = yes
 #logging = none
 #
 # force_standard_program_map_env - disable the use of the "AUTOFS_"
-#			prefix for standard environemt variables when
+#			prefix for standard environment variables when
 #			executing a program map. Since program maps
-#			are run as the privileded user this opens
+#			are run as the privileged user this opens
 #			automount(8) to potential user privilege
 #			escalation when the program map is written
-#			in a language that  can load components from,
+#			in a language that can load components from,
 #			for example, a user home directory.
 #
 # force_standard_program_map_env = no
 #
-# Otions for the amd parser within autofs.
+# use_mount_request_log_id - Set whether to use a mount request log
+#			id so that log entries for specific mount
+#			requests can be easily identified in logs
+#			that have multiple concurrent requests.
+#
+#use_mount_request_log_id = no
+#
+# Options for the amd parser within autofs.
 #
 # amd configuration options that are aren't used, haven't been
 # implemented or have different behaviour within autofs.
@@ -155,8 +179,6 @@ browse_mode = yes
 #	is a sensible option to implement and that will be
 #	done.
 #
-# browsable_dirs - not yet implemented.
-#
 # exec_map_timeout - a timeout is not currently used for
 #	for program maps, might be implemented.
 #
@@ -199,8 +221,13 @@ browse_mode = yes
 #	takes its default value from the autofs internal default
 #	of 600 seconds.
 #
+# browsable_dirs - make map keys visible in directory listings.
+#	Note that support for the "fullybrowsable" option cannot
+#	be added using the existing kernel to user space autofs
+#	implementation.
+#
 # autofs_use_lofs - if set to "yes" autofs will attempt to use bind
-#	mounts for type "auto" when possible.
+#	mounts for type "link" entries when possible.
 #
 # nis_domain - allows setting of a domain name other than the system
 #	default.
@@ -211,7 +238,7 @@ browse_mode = yes
 #	is translated in its official host name.
 #
 # domain_strip - if set to "yes" the domain name part of the host
-# 	is strippped when normalizing hostnames. This can be useful
+# 	is stripped when normalizing hostnames. This can be useful
 #	when using of the same maps in a multiple domain environment.
 #
 # normalize_slashes - is set to "yes" by default and will collapse
@@ -247,8 +274,8 @@ dismount_interval = 300
 #
 # Overriding this can cause autofs to use less resources because
 # it will use symlinks instead of bind mounts in certain cases.
-# You should ensure that the autofs kernel module your using
+# You should ensure that the autofs kernel module you are using
-# supports expration of symlinks for best results (although this
+# supports expiration of symlinks for best results (although this
 # appears to work reasonably well most of the time without the
 # update).
 #
@@ -264,6 +291,6 @@ dismount_interval = 300
 # master map entry and the format will be inherited for type
 # "auto" mounts.
 #
-# [ /expamle/mount ]
+#[ /example/mount ]
-# dismount_interval = 60
+#dismount_interval = 60
-# map_type = nis
+#map_type = nis