autofs-5.0.6 - allow MOUNT_WAIT to override probe
From: Ian Kent <ikent@redhat.com>
Allow the use of MOUNT_WAIT to override the probe of singleton
map entries. This can allow for quicker fails to hosts that are
not reachable.
---
CHANGELOG | 1 +
modules/replicated.c | 3 +++
2 files changed, 4 insertions(+)
--- autofs-5.0.6.orig/CHANGELOG
+++ autofs-5.0.6/CHANGELOG
@@ -34,6 +34,7 @@
- fix function to check mount.nfs version.
- fix typo in libtirpc file name.
- fix rework error return handling in rpc code.
+- allow MOUNT_WAIT to override probe.
28/06/2011 autofs-5.0.6
-----------------------
--- autofs-5.0.6.orig/modules/replicated.c
+++ autofs-5.0.6/modules/replicated.c
@@ -953,8 +953,11 @@ int prune_host_list(unsigned logopt, str
* are not available so check the kernel version and mount.nfs
* version and probe singleton mounts if the kernel version is
* greater than 2.6.22 and mount.nfs version is greater than 1.1.1.
+ * But also allow the MOUNT_WAIT configuration parameter to override
+ * the probing.
*/
if (nfs_mount_uses_string_options &&
+ defaults_get_mount_wait() == -1 &&
(kern_vers = linux_version_code()) > KERNEL_VERSION(2, 6, 22)) {
if (!this)
return 1;