kes Ensure that SD tried to mount a volume not in an autochanger

     at least once before asking for operator intervention.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.4@7389 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/stored/mount.c b/bacula/src/stored/mount.c
index 5cd93cf4dde72f43e8538ff5500505971f3ec908..7f229c27903268ea8675e0e8e9d5c7a7330a38d9 100644 (file)
--- a/bacula/src/stored/mount.c
+++ b/bacula/src/stored/mount.c
@@ -142,7 +142,7 @@ mount_next_vol:
    } else {
       autochanger = false;
       VolCatInfo.Slot = 0;
-      ask = true;
+      ask = retry >= 2;
    }
    Dmsg1(150, "autoload_dev returns %d\n", autochanger);
    /*

diff --git a/bacula/src/version.h b/bacula/src/version.h
index a5eda82fafae9fa8bbe078a2d79eafe6a4a42cad..68688ef9bf00cefb44be3bcb870a7d6e7f7c925a 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "2.4.1"
-#define BDATE   "07 July 2008"
-#define LSMDATE "07Jul08"
+#define BDATE   "15 July 2008"
+#define LSMDATE "15Jul08"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2008 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2008"       /* year for copyright messages in progs */

diff --git a/bacula/technotes-2.4 b/bacula/technotes-2.4
index 49e8ddeaf5c4ccf463d87e9dd2719e7d81ca5911..c39418d910e607e32f604913915d93cdba216325 100644 (file)
--- a/bacula/technotes-2.4
+++ b/bacula/technotes-2.4
@@ -1,6 +1,9 @@
               Technical notes on version 2.4
 
 General:
+15Jul08
+kes  Ensure that SD tried to mount a volume not in an autochanger
+     at least once before asking for operator intervention.
 
 Release Version 2.4.1
 07Jul08