From 25a618aa5a1ea49588e14ccda5827fe938e9a27e Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Mon, 16 Mar 2009 20:52:09 +0000 Subject: [PATCH] Increase timeout for unmounting DVD as suggested by reporter of bug #1250 git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8538 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/stored/dev.c | 4 ++-- bacula/src/version.h | 4 ++-- bacula/technotes-2.5 | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/bacula/src/stored/dev.c b/bacula/src/stored/dev.c index fce3719f6a..c350e9b021 100644 --- a/bacula/src/stored/dev.c +++ b/bacula/src/stored/dev.c @@ -2111,8 +2111,8 @@ bool DEVICE::do_mount(int mount, int dotimeout) Dmsg2(100, "do_mount: cmd=%s mounted=%d\n", ocmd.c_str(), !!is_mounted()); if (dotimeout) { - /* Try at most 1 time to (un)mount the device. This should perhaps be configurable. */ - timeout = 1; + /* Try at most 10 times to (un)mount the device. This should perhaps be configurable. */ + timeout = 10; } else { timeout = 0; } diff --git a/bacula/src/version.h b/bacula/src/version.h index c8f236cbf9..9612460079 100644 --- a/bacula/src/version.h +++ b/bacula/src/version.h @@ -4,8 +4,8 @@ #undef VERSION #define VERSION "2.5.42-b2" -#define BDATE "14 March 2009" -#define LSMDATE "14Mar09" +#define BDATE "16 March 2009" +#define LSMDATE "16Mar09" #define PROG_COPYRIGHT "Copyright (C) %d-2009 Free Software Foundation Europe e.V.\n" #define BYEAR "2009" /* year for copyright messages in progs */ diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5 index f51916e81e..b22e0e1e57 100644 --- a/bacula/technotes-2.5 +++ b/bacula/technotes-2.5 @@ -43,6 +43,9 @@ Code to be completed before 3.0.0 is released: General: +16Mar09 +kes Increase timeout for unmounting DVD as suggested by reporter + of bug #1250. 15Mar09 jh Fix by James Harper to print error code when attempting to restore two databases (only one is permitted). This responds -- 2.39.5