Blame SOURCES/autofs-5.0.9-amd-lookup-add-amd-config-descriptions-to-config.patch

6bbd11
autofs-5.0.9 - amd lookup add amd config descriptions to config
6bbd11
6bbd11
From: Ian Kent <raven@themaw.net>
6bbd11
6bbd11
Add amd configuration option descriptions to the default installed
6bbd11
configuration file.
6bbd11
6bbd11
Including details about amd options that aren't used, haven't been
6bbd11
implemented or have different behaviour within autofs.
6bbd11
---
6bbd11
 redhat/autofs.conf.default.in  |  214 ++++++++++++++++++++++++++++++++++++++++
6bbd11
 samples/autofs.conf.default.in |  214 ++++++++++++++++++++++++++++++++++++++++
6bbd11
 2 files changed, 428 insertions(+)
6bbd11
6bbd11
diff --git a/redhat/autofs.conf.default.in b/redhat/autofs.conf.default.in
6bbd11
index c1362c7..ccccaab 100644
6bbd11
--- a/redhat/autofs.conf.default.in
6bbd11
+++ b/redhat/autofs.conf.default.in
6bbd11
@@ -129,3 +129,217 @@ mount_nfs_default_protocol = 4
6bbd11
 #
6bbd11
 #map_hash_table_size = 1024
6bbd11
 #
6bbd11
+#
6bbd11
+# Otions for the amd parser within autofs.
6bbd11
+#
6bbd11
+# amd configuration options that are aren't used, haven't been
6bbd11
+# implemented or have different behaviour within autofs.
6bbd11
+#
6bbd11
+# A number of the amd configuration options are not used by autofs,
6bbd11
+# some because they are not relevant within autofs, some because
6bbd11
+# they are done differently in autofs and others that are not yet
6bbd11
+# implemented.
6bbd11
+#
6bbd11
+# Since "mount_type" is always autofs (because there's no user space
6bbd11
+# NFS server) the configuration entries relating to that aren't used.
6bbd11
+# Also, server availability is done differently within autofs so the
6bbd11
+# options that relate to the amd server monitoring sub-system are
6bbd11
+# also not used.
6bbd11
+#
6bbd11
+# These options are mount_type, auto_attrcache, portmap_program,
6bbd11
+# nfs_vers_ping, nfs_allow_any_interface, nfs_allow_insecure_port,
6bbd11
+# nfs_proto, nfs_retransmit_counter, nfs_retransmit_counter_udp,
6bbd11
+# nfs_retransmit_counter_tcp, nfs_retransmit_counter_toplvl,
6bbd11
+# nfs_retry_interval, nfs_retry_interval_udp, nfs_retry_interval_tcp,
6bbd11
+# nfs_retry_interval_toplvl and nfs_vers.
6bbd11
+#
6bbd11
+#
6bbd11
+# Other options that are not used within the autofs implementation:
6bbd11
+#
6bbd11
+# log_file, truncate_log - autofs used either stderr when running in
6bbd11
+#	the foreground or sends its output to syslog so an alternate
6bbd11
+#	log file (or truncating the log) can't be used.
6bbd11
+#
6bbd11
+# print_pid - there's no corresponding option for this within autofs.
6bbd11
+#
6bbd11
+# use_tcpwrappers, show_statfs_entries - there's no user space NFS
6bbd11
+#	server to control access to so this option isn't relevant.
6bbd11
+#	The show_statfs_entries can't be implemented for the same
6bbd11
+#	reason.
6bbd11
+#
6bbd11
+# debug_mtab_file - there's no user space NFS server and autofs
6bbd11
+#	avoids using file based mtab whenever possible.
6bbd11
+#
6bbd11
+# sun_map_syntax - obviously, are provided by autofs itself.
6bbd11
+#
6bbd11
+# plock, show_statfs_entries, preferred_amq_port - not supported.
6bbd11
+#
6bbd11
+# ldap_cache_maxmem, ldap_cache_seconds - external ldap caching
6bbd11
+#	is not used by autofs.
6bbd11
+#
6bbd11
+# ldap_proto_version - autofs always attempts to use the highest
6bbd11
+#	available ldap protocol version.
6bbd11
+#
6bbd11
+# cache_duration, map_reload_interval, map_options - the map
6bbd11
+#	entry cache is continually updated and stale entries
6bbd11
+#	cleaned on re-load, which is done when map changes are
6bbd11
+#	detected so these configuration entries are not used
6bbd11
+#	by autofs.
6bbd11
+#
6bbd11
+# localhost_address - is not used within autofs. This
6bbd11
+#	configuration option was only used in the amd user
6bbd11
+#	space server code and is not relevant within autofs.
6bbd11
+#
6bbd11
+#
6bbd11
+# Options that are handled differently within autofs:
6bbd11
+#
6bbd11
+# pid_file - must be given as a command line option on startup.
6bbd11
+#
6bbd11
+# print_version - program version and feature information is obtained
6bbd11
+#	by using the automount command line option "-V".
6bbd11
+#
6bbd11
+# debug_options, log_options - autofs has somewhat more limited
6bbd11
+#	logging and debug logging options. When the log_options
6bbd11
+#	options is encountered it is converted to the nearest
6bbd11
+#	matching autofs logging option. Since the configuration
6bbd11
+#	option debug_options would be handled the same way it
6bbd11
+#	is ignored.
6bbd11
+#
6bbd11
+# restart_mounts - has no sensible meaning within autofs because autofs
6bbd11
+#	always tries to re-connect to existing mounts. While this
6bbd11
+#	has its own set of problems not re-connecting to existing
6bbd11
+#	mounts always results in a non-functional automount tree if
6bbd11
+#	mounts were busy at the last shutdown (as is also the case
6bbd11
+#	with amd when using mount_type autofs).
6bbd11
+#
6bbd11
+# forced_unmounts - detaching mounts often causes serious problems
6bbd11
+#	for users of existing mounts. It is used by autofs in some
6bbd11
+#	cases, either at the explicit request of the user (with a
6bbd11
+#	command line or init option) and in some special cases during
6bbd11
+#	program operation but is avoided whenever possible.
6bbd11
+#
6bbd11
+#
6bbd11
+# A number of configuration options are not yet implemented:
6bbd11
+#
6bbd11
+# search_path - always a little frustrating, the compiled in
6bbd11
+#	map location should be used to locate maps but isn't
6bbd11
+#	in some cases. This requires work within autofs itself
6bbd11
+#	and that will (obviously) include implementing this
6bbd11
+#	configuration option for the amd map parser as well.
6bbd11
+#
6bbd11
+# fully_qualified_hosts - not yet implemented.
6bbd11
+#
6bbd11
+# unmount_on_exit - since autofs always tries to re-connect
6bbd11
+#	to mounts left mounted from a previous shutdown this
6bbd11
+#	is a sensible option to implement and that will be
6bbd11
+#	done.
6bbd11
+#
6bbd11
+# browsable_dirs - not yet implemented.
6bbd11
+#
6bbd11
+# exec_map_timeout - a timeout is not currently used for
6bbd11
+#	for program maps, might be implemented.
6bbd11
+#
6bbd11
+# tag - the tag option is not implemented within autofs.
6bbd11
+#
6bbd11
+#
6bbd11
+# Supported options:
6bbd11
+#
6bbd11
+# arch, karch, os, osver - these options default to what is returned
6bbd11
+#	from uname(2) and can be overridden if required.
6bbd11
+#
6bbd11
+# full_os - has no default and must be set in the configuration
6bbd11
+#	if used in maps.
6bbd11
+#
6bbd11
+# cluster - if not set defaults to the host domain name. This option
6bbd11
+#	corresponds to the HP_UX cluster name (according to the amd
6bbd11
+#	source) and is probably not used in Linux but is set anyway.
6bbd11
+#
6bbd11
+# vendor - has a default value of "unknown", it must be set in the
6bbd11
+#	configuration if used in maps.
6bbd11
+#
6bbd11
+# auto_dir - is the base name of the mount tree used for external
6bbd11
+#	mounts that are sometimes needed by amd maps. Its default
6bbd11
+#	value is "/a".
6bbd11
+#
6bbd11
+# map_type - specifies the autofs map source, such as file, nis,
6bbd11
+#	ldap etc. and has no default value set.
6bbd11
+#
6bbd11
+# map_defaults - is used to override /defaults entries within maps
6bbd11
+#	and can be used to provide different defaults on specific
6bbd11
+#	machines without having to modify centrally managed maps.
6bbd11
+#	It is empty by default.
6bbd11
+#
6bbd11
+# dismount_interval - is equivalent to the autofs timeout option. It
6bbd11
+#	is only possible to use this with type "auto" mounts due
6bbd11
+#	to the way the autofs kernel module performs expiry. It
6bbd11
+#	takes its default value from the autofs internal default
6bbd11
+#	of 600 seconds.
6bbd11
+#
6bbd11
+# autofs_use_lofs - if set to "yes" autofs will attempt to use bind
6bbd11
+#	mounts for type "auto" when possible.
6bbd11
+#
6bbd11
+# nis_domain - allows setting of a domain name other than the system
6bbd11
+#	default.
6bbd11
+#
6bbd11
+# local_domain - is used to override (or set) the host domain name.
6bbd11
+#
6bbd11
+# normalize_hostnames - if set to "yes" then the contents of ${rhost}
6bbd11
+#	is translated in its official host name.
6bbd11
+#
6bbd11
+# domain_strip - if set to "yes" the domain name part of the host
6bbd11
+# 	is strippped when normalizing hostnames. This can be useful
6bbd11
+#	when using of the same maps in a multiple domain environment.
6bbd11
+#
6bbd11
+# normalize_slashes - is set to "yes" by default and will collapse
6bbd11
+#	multiple unescaped occurrences of "/" to a single "/".
6bbd11
+#
6bbd11
+# selectors_in_defaults, selectors_on_default - has a default value
6bbd11
+#	of "no". If set to "yes" then any defaults entry will be
6bbd11
+#	checked for selectors to determine the values to be used.
6bbd11
+#	selectors_in_defaults is the preferred option to use.
6bbd11
+#
6bbd11
+# ldap_base - has no default value. It must be set to the base dn
6bbd11
+#	that is used for queries if ldap is to be used as a map
6bbd11
+#	source.
6bbd11
+#
6bbd11
+# ldap_hostports - has no default value set. It must be set to
6bbd11
+#	the URI of the LDAP server to be used for lookups when
6bbd11
+#	ldap is used a map source. It may contain a comma or
6bbd11
+#	space seperated list of LDAP URIs.
6bbd11
+#
6bbd11
+# hesiod_base - the base name used for hesiod map sources.
6bbd11
+#
6bbd11
+# Define global options for the amd parser within autofs.
6bbd11
+#
6bbd11
+[ amd ]
6bbd11
+#
6bbd11
+# Override the internal default with the same timeout that
6bbd11
+# is used by the override in the autofs configuration, sanity
6bbd11
+# only change.
6bbd11
+#
6bbd11
+dismount_interval = 300
6bbd11
+#
6bbd11
+# map_type = file
6bbd11
+#
6bbd11
+# Overriding this can cause autofs to use less resources because
6bbd11
+# it will use symlinks instead of bind mounts in certain cases.
6bbd11
+# You should ensure that the autofs kernel module your using
6bbd11
+# supports expration of symlinks for best results (although this
6bbd11
+# appears to work reasonably well most of the time without the
6bbd11
+# update).
6bbd11
+#
6bbd11
+# autofs_use_lofs = no
6bbd11
+#
6bbd11
+# Several configuration options can be set per mount point.
6bbd11
+# In particulr map_type, map_name, map_defaults, search_path,
6bbd11
+# browsable_dirs, dismount_interval and selectors_in_defaults
6bbd11
+# (not all of which are currently implemented, see above).
6bbd11
+#
6bbd11
+# Also, if a section for an amd mount point is defined here
6bbd11
+# it isn't necessary to specify the format in the corresponding
6bbd11
+# master map entry and the format will be inherited for type
6bbd11
+# "auto" mounts.
6bbd11
+#
6bbd11
+# [ /expamle/mount ]
6bbd11
+# dismount_interval = 60
6bbd11
+# map_type = nis
6bbd11
diff --git a/samples/autofs.conf.default.in b/samples/autofs.conf.default.in
6bbd11
index c8e4006..616bc66 100644
6bbd11
--- a/samples/autofs.conf.default.in
6bbd11
+++ b/samples/autofs.conf.default.in
6bbd11
@@ -128,3 +128,217 @@ browse_mode = no
6bbd11
 #
6bbd11
 #map_hash_table_size = 1024
6bbd11
 #
6bbd11
+#
6bbd11
+# Otions for the amd parser within autofs.
6bbd11
+#
6bbd11
+# amd configuration options that are aren't used, haven't been
6bbd11
+# implemented or have different behaviour within autofs.
6bbd11
+#
6bbd11
+# A number of the amd configuration options are not used by autofs,
6bbd11
+# some because they are not relevant within autofs, some because
6bbd11
+# they are done differently in autofs and others that are not yet
6bbd11
+# implemented.
6bbd11
+#
6bbd11
+# Since "mount_type" is always autofs (because there's no user space
6bbd11
+# NFS server) the configuration entries relating to that aren't used.
6bbd11
+# Also, server availability is done differently within autofs so the
6bbd11
+# options that relate to the amd server monitoring sub-system are
6bbd11
+# also not used.
6bbd11
+#
6bbd11
+# These options are mount_type, auto_attrcache, portmap_program,
6bbd11
+# nfs_vers_ping, nfs_allow_any_interface, nfs_allow_insecure_port,
6bbd11
+# nfs_proto, nfs_retransmit_counter, nfs_retransmit_counter_udp,
6bbd11
+# nfs_retransmit_counter_tcp, nfs_retransmit_counter_toplvl,
6bbd11
+# nfs_retry_interval, nfs_retry_interval_udp, nfs_retry_interval_tcp,
6bbd11
+# nfs_retry_interval_toplvl and nfs_vers.
6bbd11
+#
6bbd11
+#
6bbd11
+# Other options that are not used within the autofs implementation:
6bbd11
+#
6bbd11
+# log_file, truncate_log - autofs used either stderr when running in
6bbd11
+#	the foreground or sends its output to syslog so an alternate
6bbd11
+#	log file (or truncating the log) can't be used.
6bbd11
+#
6bbd11
+# print_pid - there's no corresponding option for this within autofs.
6bbd11
+#
6bbd11
+# use_tcpwrappers, show_statfs_entries - there's no user space NFS
6bbd11
+#	server to control access to so this option isn't relevant.
6bbd11
+#	The show_statfs_entries can't be implemented for the same
6bbd11
+#	reason.
6bbd11
+#
6bbd11
+# debug_mtab_file - there's no user space NFS server and autofs
6bbd11
+#	avoids using file based mtab whenever possible.
6bbd11
+#
6bbd11
+# sun_map_syntax - obviously, are provided by autofs itself.
6bbd11
+#
6bbd11
+# plock, show_statfs_entries, preferred_amq_port - not supported.
6bbd11
+#
6bbd11
+# ldap_cache_maxmem, ldap_cache_seconds - external ldap caching
6bbd11
+#	is not used by autofs.
6bbd11
+#
6bbd11
+# ldap_proto_version - autofs always attempts to use the highest
6bbd11
+#	available ldap protocol version.
6bbd11
+#
6bbd11
+# cache_duration, map_reload_interval, map_options - the map
6bbd11
+#	entry cache is continually updated and stale entries
6bbd11
+#	cleaned on re-load, which is done when map changes are
6bbd11
+#	detected so these configuration entries are not used
6bbd11
+#	by autofs.
6bbd11
+#
6bbd11
+# localhost_address - is not used within autofs. This
6bbd11
+#	configuration option was only used in the amd user
6bbd11
+#	space server code and is not relevant within autofs.
6bbd11
+#
6bbd11
+#
6bbd11
+# Options that are handled differently within autofs:
6bbd11
+#
6bbd11
+# pid_file - must be given as a command line option on startup.
6bbd11
+#
6bbd11
+# print_version - program version and feature information is obtained
6bbd11
+#	by using the automount command line option "-V".
6bbd11
+#
6bbd11
+# debug_options, log_options - autofs has somewhat more limited
6bbd11
+#	logging and debug logging options. When the log_options
6bbd11
+#	options is encountered it is converted to the nearest
6bbd11
+#	matching autofs logging option. Since the configuration
6bbd11
+#	option debug_options would be handled the same way it
6bbd11
+#	is ignored.
6bbd11
+#
6bbd11
+# restart_mounts - has no sensible meaning within autofs because autofs
6bbd11
+#	always tries to re-connect to existing mounts. While this
6bbd11
+#	has its own set of problems not re-connecting to existing
6bbd11
+#	mounts always results in a non-functional automount tree if
6bbd11
+#	mounts were busy at the last shutdown (as is also the case
6bbd11
+#	with amd when using mount_type autofs).
6bbd11
+#
6bbd11
+# forced_unmounts - detaching mounts often causes serious problems
6bbd11
+#	for users of existing mounts. It is used by autofs in some
6bbd11
+#	cases, either at the explicit request of the user (with a
6bbd11
+#	command line or init option) and in some special cases during
6bbd11
+#	program operation but is avoided whenever possible.
6bbd11
+#
6bbd11
+#
6bbd11
+# A number of configuration options are not yet implemented:
6bbd11
+#
6bbd11
+# search_path - always a little frustrating, the compiled in
6bbd11
+#	map location should be used to locate maps but isn't
6bbd11
+#	in some cases. This requires work within autofs itself
6bbd11
+#	and that will (obviously) include implementing this
6bbd11
+#	configuration option for the amd map parser as well.
6bbd11
+#
6bbd11
+# fully_qualified_hosts - not yet implemented.
6bbd11
+#
6bbd11
+# unmount_on_exit - since autofs always tries to re-connect
6bbd11
+#	to mounts left mounted from a previous shutdown this
6bbd11
+#	is a sensible option to implement and that will be
6bbd11
+#	done.
6bbd11
+#
6bbd11
+# browsable_dirs - not yet implemented.
6bbd11
+#
6bbd11
+# exec_map_timeout - a timeout is not currently used for
6bbd11
+#	for program maps, might be implemented.
6bbd11
+#
6bbd11
+# tag - the tag option is not implemented within autofs.
6bbd11
+#
6bbd11
+#
6bbd11
+# Supported options:
6bbd11
+#
6bbd11
+# arch, karch, os, osver - these options default to what is returned
6bbd11
+#	from uname(2) and can be overridden if required.
6bbd11
+#
6bbd11
+# full_os - has no default and must be set in the configuration
6bbd11
+#	if used in maps.
6bbd11
+#
6bbd11
+# cluster - if not set defaults to the host domain name. This option
6bbd11
+#	corresponds to the HP_UX cluster name (according to the amd
6bbd11
+#	source) and is probably not used in Linux but is set anyway.
6bbd11
+#
6bbd11
+# vendor - has a default value of "unknown", it must be set in the
6bbd11
+#	configuration if used in maps.
6bbd11
+#
6bbd11
+# auto_dir - is the base name of the mount tree used for external
6bbd11
+#	mounts that are sometimes needed by amd maps. Its default
6bbd11
+#	value is "/a".
6bbd11
+#
6bbd11
+# map_type - specifies the autofs map source, such as file, nis,
6bbd11
+#	ldap etc. and has no default value set.
6bbd11
+#
6bbd11
+# map_defaults - is used to override /defaults entries within maps
6bbd11
+#	and can be used to provide different defaults on specific
6bbd11
+#	machines without having to modify centrally managed maps.
6bbd11
+#	It is empty by default.
6bbd11
+#
6bbd11
+# dismount_interval - is equivalent to the autofs timeout option. It
6bbd11
+#	is only possible to use this with type "auto" mounts due
6bbd11
+#	to the way the autofs kernel module performs expiry. It
6bbd11
+#	takes its default value from the autofs internal default
6bbd11
+#	of 600 seconds.
6bbd11
+#
6bbd11
+# autofs_use_lofs - if set to "yes" autofs will attempt to use bind
6bbd11
+#	mounts for type "auto" when possible.
6bbd11
+#
6bbd11
+# nis_domain - allows setting of a domain name other than the system
6bbd11
+#	default.
6bbd11
+#
6bbd11
+# local_domain - is used to override (or set) the host domain name.
6bbd11
+#
6bbd11
+# normalize_hostnames - if set to "yes" then the contents of ${rhost}
6bbd11
+#	is translated in its official host name.
6bbd11
+#
6bbd11
+# domain_strip - if set to "yes" the domain name part of the host
6bbd11
+# 	is strippped when normalizing hostnames. This can be useful
6bbd11
+#	when using of the same maps in a multiple domain environment.
6bbd11
+#
6bbd11
+# normalize_slashes - is set to "yes" by default and will collapse
6bbd11
+#	multiple unescaped occurrences of "/" to a single "/".
6bbd11
+#
6bbd11
+# selectors_in_defaults, selectors_on_default - has a default value
6bbd11
+#	of "no". If set to "yes" then any defaults entry will be
6bbd11
+#	checked for selectors to determine the values to be used.
6bbd11
+#	selectors_in_defaults is the preferred option to use.
6bbd11
+#
6bbd11
+# ldap_base - has no default value. It must be set to the base dn
6bbd11
+#	that is used for queries if ldap is to be used as a map
6bbd11
+#	source.
6bbd11
+#
6bbd11
+# ldap_hostports - has no default value set. It must be set to
6bbd11
+#	the URI of the LDAP server to be used for lookups when
6bbd11
+#	ldap is used a map source. It may contain a comma or
6bbd11
+#	space seperated list of LDAP URIs.
6bbd11
+#
6bbd11
+# hesiod_base - the base name used for hesiod map sources.
6bbd11
+#
6bbd11
+# Define global options for the amd parser within autofs.
6bbd11
+#
6bbd11
+[ amd ]
6bbd11
+#
6bbd11
+# Override the internal default with the same timeout that
6bbd11
+# is used by the override in the autofs configuration, sanity
6bbd11
+# only change.
6bbd11
+#
6bbd11
+dismount_interval = 300
6bbd11
+#
6bbd11
+# map_type = file
6bbd11
+#
6bbd11
+# Overriding this can cause autofs to use less resources because
6bbd11
+# it will use symlinks instead of bind mounts in certain cases.
6bbd11
+# You should ensure that the autofs kernel module your using
6bbd11
+# supports expration of symlinks for best results (although this
6bbd11
+# appears to work reasonably well most of the time without the
6bbd11
+# update).
6bbd11
+#
6bbd11
+# autofs_use_lofs = no
6bbd11
+#
6bbd11
+# Several configuration options can be set per mount point.
6bbd11
+# In particulr map_type, map_name, map_defaults, search_path,
6bbd11
+# browsable_dirs, dismount_interval and selectors_in_defaults
6bbd11
+# (not all of which are currently implemented, see above).
6bbd11
+#
6bbd11
+# Also, if a section for an amd mount point is defined here
6bbd11
+# it isn't necessary to specify the format in the corresponding
6bbd11
+# master map entry and the format will be inherited for type
6bbd11
+# "auto" mounts.
6bbd11
+#
6bbd11
+# [ /expamle/mount ]
6bbd11
+# dismount_interval = 60
6bbd11
+# map_type = nis