autofs-5.0.7 - improve timeout option description
From: Ian Kent <raven@themaw.net>
The description of the configuration option is a little misleading.
So add some explaination about the internal default and the reason
the default installed configuration overrides it.
---
CHANGELOG | 1 +
man/auto.master.5.in | 5 ++++-
man/automount.8 | 5 ++++-
redhat/autofs.sysconfig.in | 5 ++++-
samples/autofs.conf.default.in | 5 ++++-
5 files changed, 17 insertions(+), 4 deletions(-)
--- autofs-5.0.7.orig/CHANGELOG
+++ autofs-5.0.7/CHANGELOG
@@ -65,6 +65,7 @@
- fix portmap lookup.
- only probe specific nfs version if requested.
- fix ipv6 libtirpc getport.
+- improve timeout option description.
25/07/2012 autofs-5.0.7
=======================
--- autofs-5.0.7.orig/man/auto.master.5.in
+++ autofs-5.0.7/man/auto.master.5.in
@@ -212,7 +212,10 @@ configuration file
They are:
.TP
.B TIMEOUT
-sets the default mount timeout (program default 600).
+Sets 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.
.TP
.B NEGATIVE_TIMEOUT
Set the default timeout for caching failed key lookups (program default
--- autofs-5.0.7.orig/man/automount.8
+++ autofs-5.0.7/man/automount.8
@@ -29,10 +29,13 @@ Print brief help on program usage.
.I "\-p, \-\-pid-file"
Write the pid of the daemon to the specified file.
.TP
-.I "\-t, \-\-timeout"
+.I "\-t <seconds>, \-\-timeout <seconds>"
Set the global minimum timeout, in seconds, until directories
are unmounted. The default is 10 minutes. Setting the timeout
to zero disables umounts completely.
+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.
.TP
.I "\-n <seconds>, \-\-negative\-timeout <seconds>"
Set the default timeout for caching failed key lookups. The default is 60 seconds.
--- autofs-5.0.7.orig/redhat/autofs.sysconfig.in
+++ autofs-5.0.7/redhat/autofs.sysconfig.in
@@ -5,7 +5,10 @@
#
#MASTER_MAP_NAME="auto.master"
#
-# TIMEOUT - set the default mount timeout (default 600).
+# TIMEOUT - set the default mount timeout in secons. 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=300
#
--- autofs-5.0.7.orig/samples/autofs.conf.default.in
+++ autofs-5.0.7/samples/autofs.conf.default.in
@@ -5,7 +5,10 @@
#
#MASTER_MAP_NAME="auto.master"
#
-# TIMEOUT - set the default mount timeout (default 600).
+# TIMEOUT - set the default mount timeout in secons. 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=300
#