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