|
 |
23b4c9 |
autofs-5.1.2 - set sane default master read wait timeout
|
|
|
23b4c9 |
|
|
|
23b4c9 |
From: Ian Kent <raven@themaw.net>
|
|
|
23b4c9 |
|
|
|
23b4c9 |
If an unused map source is configured in nss, with the default
|
|
|
23b4c9 |
of waiting indefinitely, autofs will not start.
|
|
|
23b4c9 |
|
|
|
23b4c9 |
To restore the previous behaviour of this case set a sensible
|
|
|
23b4c9 |
default timeout for the configuration option master_wait.
|
|
|
23b4c9 |
|
|
|
23b4c9 |
Signed-off-by: Ian Kent <raven@themaw.net>
|
|
|
23b4c9 |
---
|
|
|
23b4c9 |
CHANGELOG | 1 +
|
|
|
23b4c9 |
include/defaults.h | 2 +-
|
|
|
23b4c9 |
man/autofs.conf.5.in | 4 ++--
|
|
|
23b4c9 |
redhat/autofs.conf.default.in | 6 +++---
|
|
|
23b4c9 |
samples/autofs.conf.default.in | 6 +++---
|
|
|
23b4c9 |
5 files changed, 10 insertions(+), 9 deletions(-)
|
|
|
23b4c9 |
|
|
|
23b4c9 |
--- autofs-5.0.7.orig/CHANGELOG
|
|
|
23b4c9 |
+++ autofs-5.0.7/CHANGELOG
|
|
|
23b4c9 |
@@ -210,6 +210,7 @@
|
|
|
23b4c9 |
- add master read wait option.
|
|
|
23b4c9 |
- fix included master map not found return.
|
|
|
23b4c9 |
- dont exit on master map read fail timeout.
|
|
|
23b4c9 |
+- set sane default master read wait timeout.
|
|
|
23b4c9 |
|
|
|
23b4c9 |
25/07/2012 autofs-5.0.7
|
|
|
23b4c9 |
=======================
|
|
|
23b4c9 |
--- autofs-5.0.7.orig/include/defaults.h
|
|
|
23b4c9 |
+++ autofs-5.0.7/include/defaults.h
|
|
|
23b4c9 |
@@ -25,7 +25,7 @@
|
|
|
23b4c9 |
#define DEFAULT_MASTER_MAP_NAME "auto.master"
|
|
|
23b4c9 |
|
|
|
23b4c9 |
#define DEFAULT_TIMEOUT "600"
|
|
|
23b4c9 |
-#define DEFAULT_MASTER_WAIT "-1"
|
|
|
23b4c9 |
+#define DEFAULT_MASTER_WAIT "10"
|
|
|
23b4c9 |
#define DEFAULT_NEGATIVE_TIMEOUT "60"
|
|
|
23b4c9 |
#define DEFAULT_MOUNT_WAIT "-1"
|
|
|
23b4c9 |
#define DEFAULT_UMOUNT_WAIT "12"
|
|
|
23b4c9 |
--- autofs-5.0.7.orig/man/autofs.conf.5.in
|
|
|
23b4c9 |
+++ autofs-5.0.7/man/autofs.conf.5.in
|
|
|
23b4c9 |
@@ -32,8 +32,8 @@ with earlier autofs releases.
|
|
|
23b4c9 |
.TP
|
|
|
23b4c9 |
.B master_wait
|
|
|
23b4c9 |
sets the default maximum time to wait for the master map to become
|
|
|
23b4c9 |
-available if it cannot be read at program start (program default -1,
|
|
|
23b4c9 |
-wait forever).
|
|
|
23b4c9 |
+available if it cannot be read at program start (program default 10,
|
|
|
23b4c9 |
+wait for 10 seconds then continue).
|
|
|
23b4c9 |
.TP
|
|
|
23b4c9 |
.B negative_timeout
|
|
|
23b4c9 |
.br
|
|
|
23b4c9 |
--- autofs-5.0.7.orig/redhat/autofs.conf.default.in
|
|
|
23b4c9 |
+++ autofs-5.0.7/redhat/autofs.conf.default.in
|
|
|
23b4c9 |
@@ -16,10 +16,10 @@ timeout = 300
|
|
|
23b4c9 |
#
|
|
|
23b4c9 |
# master_wait - set the default maximum time to wait for the
|
|
|
23b4c9 |
# master map to become available if it cannot
|
|
|
23b4c9 |
-# be read at program start (default -1, wait
|
|
|
23b4c9 |
-# forever).
|
|
|
23b4c9 |
+# be read at program start (default 10, wait
|
|
|
23b4c9 |
+# for 10 seconds then continue).
|
|
|
23b4c9 |
#
|
|
|
23b4c9 |
-#master_wait = -1
|
|
|
23b4c9 |
+#master_wait = 10
|
|
|
23b4c9 |
#
|
|
|
23b4c9 |
# negative_timeout - set the default negative timeout for
|
|
|
23b4c9 |
# failed mount attempts (default 60).
|
|
|
23b4c9 |
--- autofs-5.0.7.orig/samples/autofs.conf.default.in
|
|
|
23b4c9 |
+++ autofs-5.0.7/samples/autofs.conf.default.in
|
|
|
23b4c9 |
@@ -16,10 +16,10 @@ timeout = 300
|
|
|
23b4c9 |
#
|
|
|
23b4c9 |
# master_wait - set the default maximum time to wait for the
|
|
|
23b4c9 |
# master map to become available if it cannot
|
|
|
23b4c9 |
-# be read at program start (default -1, wait
|
|
|
23b4c9 |
-# forever).
|
|
|
23b4c9 |
+# be read at program start (default 10, wait
|
|
|
23b4c9 |
+# for 10 seconds then continue).
|
|
|
23b4c9 |
#
|
|
|
23b4c9 |
-# master_wait = -1
|
|
|
23b4c9 |
+# master_wait = 10
|
|
|
23b4c9 |
#
|
|
|
23b4c9 |
# negative_timeout - set the default negative timeout for
|
|
|
23b4c9 |
# failed mount attempts (default 60).
|