From: Eric Bollengier <eric@eb.homelinux.org>
Date: Thu, 29 Nov 2007 21:36:36 +0000 (+0000)
Subject: ebl  Add Richard Mortimer patch about #1016
X-Git-Tag: Release-7.0.0~5345
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ab36f19f3d0fe39bcae44b41316ebe6c9a0c5742;p=bacula%2Fbacula

ebl  Add Richard Mortimer patch about #1016


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@5999 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/patches/2.2.6-dvdwrite_trialfix.patch b/bacula/patches/2.2.6-dvdwrite_trialfix.patch
new file mode 100644
index 0000000000..044d09ec92
--- /dev/null
+++ b/bacula/patches/2.2.6-dvdwrite_trialfix.patch
@@ -0,0 +1,28 @@
+  This patch should fix #1016 when there are more than one "part" to write.
+  Instead of each part being stored on disk, written to DVD, then deleted from
+  disk, all parts are written to disk, and only the last is written and deleted
+  from disk.
+
+  Apply it to 2.2.6 (and possibly previous 2.2.x versions) with:
+
+  cd <bacula-source>
+  patch -p0 <2.2.6-dvdwrite_trialfix.patch
+  ./configure <your-options>
+  make
+  ...
+  make install
+
+
+Index: src/stored/dev.c
+===================================================================
+--- src/stored/dev.c	(revision 5996)
++++ src/stored/dev.c	(working copy)
+@@ -1856,7 +1856,7 @@
+    /* Clean up device packet so it can be reused */
+    clear_opened();
+    state &= ~(ST_LABEL|ST_READ|ST_APPEND|ST_EOT|ST_WEOT|ST_EOF|
+-              ST_MOUNTED|ST_MEDIA|ST_SHORT|ST_FREESPACE_OK|ST_PART_SPOOLED);
++              ST_MOUNTED|ST_MEDIA|ST_SHORT);
+    label_type = B_BACULA_LABEL;
+    file = block_num = 0;
+    file_size = 0;
diff --git a/bacula/src/stored/dev.c b/bacula/src/stored/dev.c
index feaab57d33..52d5d29614 100644
--- a/bacula/src/stored/dev.c
+++ b/bacula/src/stored/dev.c
@@ -1856,7 +1856,7 @@ void DEVICE::close()
    /* Clean up device packet so it can be reused */
    clear_opened();
    state &= ~(ST_LABEL|ST_READ|ST_APPEND|ST_EOT|ST_WEOT|ST_EOF|
-              ST_MOUNTED|ST_MEDIA|ST_SHORT|ST_FREESPACE_OK|ST_PART_SPOOLED);
+              ST_MOUNTED|ST_MEDIA|ST_SHORT);
    label_type = B_BACULA_LABEL;
    file = block_num = 0;
    file_size = 0;
diff --git a/bacula/technotes-2.3 b/bacula/technotes-2.3
index fda756c012..779dcb1f1d 100644
--- a/bacula/technotes-2.3
+++ b/bacula/technotes-2.3
@@ -1,6 +1,11 @@
               Technical notes on version 2.3
 
 General:
+29Nov07
+ebl  Apply Richard Mortimer patch that fixes #1016 when there are more than 
+     one "part" to write.  Instead of each part being stored on disk, 
+     written to DVD, then deleted from disk, all parts are written to disk,
+     and only the last is written and deleted from disk.
 kes  This patch fixes the status command to include the formating string for
      JS_AttrInsterting.  It fixes bug #1021.
 kes  This patch should fix the Mac OS X build problem on the latest