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 0e18e92ea4557261b6dc14cb1b21c908ee85eecf..59a2380e8947b999238ea8c610ec4ab7f833db37 100644 (file)
--- 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 d021daad5c1d762df0c2ad119502aa1e2aae750a..5018864e336025e9783dc02c169ce1d6065334d3 100644 (file)
--- 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,