Bacula

Update of /cvsroot/bacula/bacula/doc/techlogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13822/doc/techlogs

Modified Files:
	nb-1.37 
Log Message:
 - Fix "unknown device type" problem with DVD devices.
 - Fix crash when there is no media in the DVD drive.

Index: nb-1.37
===================================================================
RCS file: /cvsroot/bacula/bacula/doc/techlogs/nb-1.37,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- nb-1.37	9 Jan 2005 15:32:54 -0000	1.3
+++ nb-1.37	7 Apr 2005 13:09:17 -0000	1.4
@@ -4,11 +4,30 @@
 General:
 
 Changes to 1.37.1:
-29Dec04
- - Add VolParts field in Media table
- - Add MaximumPartSize directive in Device (SD configuration file)
- - File Volumes can now be splitted in multiple files ("parts")
- - Fix SQL error in sql_list while doing "llist jobmedia"
+07Apr05
+ - Fix "unknown device type" problem with DVD devices.
+ - Fix crash when there is no media in the DVD drive.
+09Jan05
+ - Update the documentation and ReleaseNotes.
+05Jan05
+ - Add FreeSpaceCommand in Device (SD configuration file) and implement it.
+ - Some modifications (again) on how guessed volume names are handled (now it should work).
+ - Part files on the hard disk are removed if they are empty.
+04Jan05
+ - Major fixes on how guessed volume names are handled.
+ - Minor fix in src/stored/append.c.
+ - Replace, when possible, POOLMEM by POOL_MEM in the new code of src/stored/dev.c.
+ - New script, scripts/dvd-freespace, which gets the free space available on a writable DVD.
+03Jan05
+ - Add WritePartAfterJob directive in Job resource (Director)
+ - Add WritePartAfterJob directive in Schedule Resource (Director)
+ - Implement these new directives
+02Jan05
+ - New function, open_guess_name_dev in src/stored/dev.c, which tries to guess the volume
+   name of a mounted device, so the label can be read.  
+ - New script, scripts/dvd-writepart, which write parts to DVD+/-R(W).
+ - Removed WriteFirstPartCommand directive in Device (SD configuration file).
+ - Use readdir_r instead of readdir (src/stored/dev.c:open_guess_name_dev).
 01Jan05
  - Add RequiresMount, MountPoint, MountCommand, UnmountCommand directives in Device (SD configuration file).
  - Implement these directives (volumes can now be restored from a manually written DVD). 
@@ -16,24 +35,8 @@
  - Implement these directives (DVD writing now works).
  - New function run_program_full_output in src/lib/bpipe.c.
  - Lots of bugfixes and cleanups in the new code.
-02Jan05
- - New function, open_guess_name_dev in src/stored/dev.c, which tries to guess the volume
-   name of a mounted device, so the label can be read.  
- - New script, scripts/dvd-writepart, which write parts to DVD+/-R(W).
- - Removed WriteFirstPartCommand directive in Device (SD configuration file).
- - Use readdir_r instead of readdir (src/stored/dev.c:open_guess_name_dev).
-03Jan05
- - Add WritePartAfterJob directive in Job resource (Director)
- - Add WritePartAfterJob directive in Schedule Resource (Director)
- - Implement these new directives
-04Jan05
- - Major fixes on how guessed volume names are handled.
- - Minor fix in src/stored/append.c.
- - Replace, when possible, POOLMEM by POOL_MEM in the new code of src/stored/dev.c.
- - New script, scripts/dvd-freespace, which gets the free space available on a writable DVD.
-05Jan05
- - Add FreeSpaceCommand in Device (SD configuration file) and implement it.
- - Some modifications (again) on how guessed volume names are handled (now it should work).
- - Part files on the hard disk are removed if they are empty.
-09Jan05
- - Update the documentation and ReleaseNotes.
\ No newline at end of file
+29Dec04
+ - Add VolParts field in Media table
+ - Add MaximumPartSize directive in Device (SD configuration file)
+ - File Volumes can now be splitted in multiple files ("parts")
+ - Fix SQL error in sql_list while doing "llist jobmedia"

Update of /cvsroot/bacula/bacula/src/stored
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13822/src/stored

Modified Files:
	dev.c dvd.c label.c 
Log Message:
 - Fix "unknown device type" problem with DVD devices.
 - Fix crash when there is no media in the DVD drive.

Index: label.c
===================================================================
RCS file: /cvsroot/bacula/bacula/src/stored/label.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- label.c	22 Mar 2005 20:49:06 -0000	1.69
+++ label.c	7 Apr 2005 13:09:24 -0000	1.70
@@ -258,7 +258,7 @@
       if (!write || dcr->VolCatInfo.VolCatParts > 0) {
          Mmsg2(jcr->errmsg, _("Requested Volume \"%s\" on %s is not a Bacula labeled Volume."),
 	       dev->print_name(), dcr->VolumeName);
-         Dmsg0(100, "Leave read_dev_volume_label_guess VOL_IO_ERROR (!open_guess_name_dev)\n");
+         Dmsg0(100, "Leave read_dev_volume_label_guess VOL_NO_LABEL (!open_guess_name_dev)\n");
 	 return VOL_NO_LABEL;
       }
       

Index: dev.c
===================================================================
RCS file: /cvsroot/bacula/bacula/src/stored/dev.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- dev.c	1 Apr 2005 15:21:44 -0000	1.118
+++ dev.c	7 Apr 2005 13:09:24 -0000	1.119
@@ -136,7 +136,7 @@
       tape = true;
    } else if (S_ISFIFO(statp.st_mode)) {
       fifo = true;
-   } else {
+   } else if (!(device->cap_bits & CAP_REQMOUNT)) {
       if (dev) {
 	 dev->dev_errno = ENODEV;
       }

Index: dvd.c
===================================================================
RCS file: /cvsroot/bacula/bacula/src/stored/dvd.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dvd.c	1 Apr 2005 15:21:45 -0000	1.3
+++ dvd.c	7 Apr 2005 13:09:24 -0000	1.4
@@ -209,9 +209,8 @@
          Dmsg1(100, "open_guess_name_dev: device cannot be mounted, but it seems to be writable, returning 0. dev=%s\n", dev->dev_name);
          return 0;
       } else {
-         Dmsg1(100, "open_guess_name_dev: device cannot be mounted, and is not writable, returning 0. dev=%s\n", dev->dev_name);
-         /* read_dev_volume_label_guess must now check dev->free_space_errno to understand that the media is not writable. */
-         return 0;
+         Dmsg1(100, "open_guess_name_dev: device cannot be mounted, and is not writable, returning -1. dev=%s\n", dev->dev_name);
+         return -1;
       }
    }