From 535b9838a30baff6c0defd4923f672ea31959f24 Mon Sep 17 00:00:00 2001
From: Eric Bollengier <eric@eb.homelinux.org>
Date: Tue, 25 Mar 2008 21:59:05 +0000
Subject: [PATCH] ebl  Add 2.2.8-jobmedia-fix patch

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2@6689 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/patches/2.2.8-jobmedia-fix.patch | 40 +++++++++++++++++++++++++
 bacula/patches/2.2.8-jobmedia.patch     |  3 ++
 2 files changed, 43 insertions(+)
 create mode 100644 bacula/patches/2.2.8-jobmedia-fix.patch

diff --git a/bacula/patches/2.2.8-jobmedia-fix.patch b/bacula/patches/2.2.8-jobmedia-fix.patch
new file mode 100644
index 0000000000..89807be4ab
--- /dev/null
+++ b/bacula/patches/2.2.8-jobmedia-fix.patch
@@ -0,0 +1,40 @@
+
+ This patch fixes a bug that cause storage to create JOBMEDIA records 
+ for every block written to tape.
+
+ This Patch works with 2.2.8-jobmedia.patch
+
+ Apply this patch to Bacula 2.2.8 (and possibly any prior 2.2.x version) with:
+
+ cd <bacula-source>
+ patch -p0 <2.2.8-jobmedia-fix.patch
+ ./configure <your-options>
+ make
+ ...
+ make install
+
+
+Index: src/stored/block.c
+===================================================================
+--- src/stored/block.c  (revision 6531)
++++ src/stored/block.c  (working copy)
+@@ -374,7 +374,6 @@
+       if (dcr->NewVol) {
+          /* Note, setting a new volume also handles any pending new file */
+          set_new_volume_parameters(dcr);
+-         dcr->NewFile = false;        /* this handled for new file too */
+       } else {
+          set_new_file_parameters(dcr);
+       }
+Index: src/stored/device.c
+===================================================================
+--- src/stored/device.c (revision 6531)
++++ src/stored/device.c (working copy)
+@@ -226,6 +226,7 @@
+    }
+    set_new_file_parameters(dcr);
+    jcr->NumWriteVolumes++;
++   dcr->NewVol = false;
+ }
+
+ /*
diff --git a/bacula/patches/2.2.8-jobmedia.patch b/bacula/patches/2.2.8-jobmedia.patch
index 497c9c7dba..5a6dad3022 100644
--- a/bacula/patches/2.2.8-jobmedia.patch
+++ b/bacula/patches/2.2.8-jobmedia.patch
@@ -4,10 +4,13 @@
  for the first record during a restore rather than seek directly to
  it.
 
+ You have to apply 2.2.8-jobmedia-fix.patch too.
+
  Apply this patch to Bacula 2.2.8 (and possibly any prior 2.2.x version) with:
 
  cd <bacula-source>
  patch -p0 <2.2.8-jobmedia.patch
+ patch -p0 <2.2.8-jobmedia-fix.patch
  ./configure <your-options>
  make
  ...
-- 
2.39.5