From 4b6d6ef6498c351ac8ae0ffe5ac10a0298056415 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 5 Mar 2003 10:44:44 +0000
Subject: [PATCH] Tape acquisition fix by Chuck Hemker and document table of
 supported autochangers

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@365 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/INSTALL              |  3 +++
 bacula/README               | 17 +++++++++++++++++
 bacula/kernstodo            |  6 +++++-
 bacula/src/stored/acquire.c |  2 +-
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/bacula/INSTALL b/bacula/INSTALL
index 2998b61ecb..21c8b5bdb5 100644
--- a/bacula/INSTALL
+++ b/bacula/INSTALL
@@ -25,6 +25,9 @@ Using GNU autoconfig
         A typical Bacula development configuration for Linux is:
 
         CFLAGS="-g -Wall" ./configure --enable-smartalloc --enable-mysql
+
+        see README for a few additional details and the online manual
+        for all the gory details:  http://www.bacula.org/html-manual
           
 
   3.    set any other main preferences (normally, you don't do this):
diff --git a/bacula/README b/bacula/README
index 5c5d9b113c..716db7be55 100644
--- a/bacula/README
+++ b/bacula/README
@@ -29,6 +29,23 @@ To Configure it:
     --with-job-email=YOUR_EMAIL_ADDRESS \
     --with-smtp-host=YOUR_SMTP_SERVER_ADDRESS
 
+Note, if you do not have readline installed on your
+system, you either need to add:
+     
+     --disable-readline 
+
+or add:
+
+     --with-readline=$HOME/bacula/depkgs1/readline
+
+where I assume you have loaded depkgs1 into $HOME/bacula
+and built the readline routine.      
+
+If you want to use SQLite, please download depkgs and
+build sqlite, then add something like:
+
+    --with-sqlite=$HOME/depkgs/sqlite
+
 
 Build Bacula:
 
diff --git a/bacula/kernstodo b/bacula/kernstodo
index 88b592272e..656c7ecc5c 100644
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -16,6 +16,11 @@ Testing to do: (painful)
 - multiple simultaneous Volumes
 
 For 1.30 release:
+- Add a section to the doc on Manual cycling
+- Look at purge jobs volume (at least document it, and see if it is
+  logical).
+- Add list volumes pool=*
+- Add pool= to "list media" in ua_output.c
 - Figure out some way to specify a retention period for files
   that no longer exist on the machine -- so that we maintain
   say backups for 30 days, but if the file is deleted, we maintain
@@ -871,4 +876,3 @@ Done: (see kernsdone for more)
   scheduled.
 - Implement TCP/IP connection for MySQL
 - Pull a canceled job from the Scheduling queue.
-
diff --git a/bacula/src/stored/acquire.c b/bacula/src/stored/acquire.c
index 99a6f33333..e8672b5e08 100644
--- a/bacula/src/stored/acquire.c
+++ b/bacula/src/stored/acquire.c
@@ -170,7 +170,7 @@ DEVICE * acquire_device_for_append(JCR *jcr, DEVICE *dev, DEV_BLOCK *block)
        *    dir_find_next_appendable_volume
        */
       strcpy(jcr->VolumeName, dev->VolHdr.VolName);
-      if (!dir_get_volume_info(jcr, 1) ||
+      if (!dir_get_volume_info(jcr, 1) &&
 	  !(dir_find_next_appendable_volume(jcr) &&
 	    strcmp(dev->VolHdr.VolName, jcr->VolumeName) == 0)) { /* wrong tape mounted */
 	 if (dev->num_writers != 0) {
-- 
2.39.5