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