You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
45 lines
1.3 KiB
45 lines
1.3 KiB
autofs-5.1.2 - dont exit on master map read fail timeout |
|
|
|
From: Ian Kent <raven@themaw.net> |
|
|
|
If there is a persistent master map read failure autofs should |
|
continue on after the configured retry wait, as it would have |
|
done previously. |
|
|
|
Signed-off-by: Ian Kent <raven@themaw.net> |
|
--- |
|
CHANGELOG | 1 + |
|
daemon/automount.c | 12 ++++++++---- |
|
2 files changed, 9 insertions(+), 4 deletions(-) |
|
|
|
--- autofs-5.0.7.orig/CHANGELOG |
|
+++ autofs-5.0.7/CHANGELOG |
|
@@ -209,6 +209,7 @@ |
|
- wait for master map available at start. |
|
- add master read wait option. |
|
- fix included master map not found return. |
|
+- dont exit on master map read fail timeout. |
|
|
|
25/07/2012 autofs-5.0.7 |
|
======================= |
|
--- autofs-5.0.7.orig/daemon/automount.c |
|
+++ autofs-5.0.7/daemon/automount.c |
|
@@ -2510,10 +2510,14 @@ int main(int argc, char *argv[]) |
|
* error. |
|
*/ |
|
if (!do_master_read_master(master_list, master_wait)) { |
|
- logerr("%s: failed to read master map!", program); |
|
- master_kill(master_list); |
|
- release_flag_file(); |
|
- exit(3); |
|
+ logmsg("%s: warning: could not read at least one " |
|
+ "map source after waiting, continuing ...", |
|
+ program); |
|
+ /* |
|
+ * Failed to read master map, continue with what |
|
+ * we have anyway. |
|
+ */ |
|
+ master_read_master(master_list, age, 1); |
|
} |
|
} |
|
|
|
|