From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 5 Sep 2006 08:17:15 +0000 (+0000)
Subject: Correct dvd code that breaks tape labeling
X-Git-Tag: Release-2.0.0~506
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=09f9a9227e76eb53ddc964a750a924f9eade0865;p=bacula%2Fbacula

Correct dvd code that breaks tape labeling


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

diff --git a/bacula/src/stored/label.c b/bacula/src/stored/label.c
index 0e18e92ea4..59a2380e89 100644
--- a/bacula/src/stored/label.c
+++ b/bacula/src/stored/label.c
@@ -560,7 +560,7 @@ void create_volume_label(DEVICE *dev, const char *VolName,
 
    bstrncpy(dev->VolHdr.Id, BaculaId, sizeof(dev->VolHdr.Id));
    dev->VolHdr.VerNum = BaculaTapeVersion;
-   if (dvdnow) {
+   if (dev->is_dvd() && dvdnow) {
       /* We do not want to re-label a DVD so write VOL_LABEL now */
       dev->VolHdr.LabelType = VOL_LABEL;
    } else {
diff --git a/bacula/technotes-1.39 b/bacula/technotes-1.39
index d021daad5c..5018864e33 100644
--- a/bacula/technotes-1.39
+++ b/bacula/technotes-1.39
@@ -2,6 +2,7 @@
 
 General:
 04Sep06
+kes  Correct dvd code that breaks tape labeling.      
 kes  Implement Enabled on update slots.
 02Sep06
 kes  When doing a label, pass the VolBytes back to the Director,