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(-) diff --git a/CHANGELOG b/CHANGELOG index c3f12e5..9639703 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -73,6 +73,7 @@ - teach dumpmaps to output simple key value pairs. - fix syncronize handle_mounts() shutdown. - fix fix wildcard multi map regression. +- improve timeout option description. 25/07/2012 autofs-5.0.7 ======================= diff --git a/man/auto.master.5.in b/man/auto.master.5.in index 7907ffa..65a86b2 100644 --- a/man/auto.master.5.in +++ b/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 diff --git a/man/automount.8 b/man/automount.8 index 48f5c5a..abb40bc 100644 --- a/man/automount.8 +++ b/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. diff --git a/redhat/autofs.sysconfig.in b/redhat/autofs.sysconfig.in index a8992c4..9d8d704 100644 --- a/redhat/autofs.sysconfig.in +++ b/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 # diff --git a/samples/autofs.conf.default.in b/samples/autofs.conf.default.in index 1da89cf..695b010 100644 --- a/samples/autofs.conf.default.in +++ b/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 # -- To unsubscribe from this list: send the line "unsubscribe autofs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
