From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 16 Mar 2009 20:52:09 +0000 (+0000)
Subject: Increase timeout for unmounting DVD as suggested by reporter
X-Git-Tag: Release-3.0.0~154
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d2b53542626505e2e9ca60a61be59735e6b3a511;p=bacula%2Fbacula

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
---

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