Remove conio.c from console link for moment

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

diff --git a/bacula/src/console/Makefile.in b/bacula/src/console/Makefile.in
index d7aefc1756f6f7a5780db9298ed6775bc3622f28..062028f3f5c4ac556c065915be60948c502964fc 100644 (file)
--- a/bacula/src/console/Makefile.in
+++ b/bacula/src/console/Makefile.in
@@ -20,8 +20,8 @@ first_rule: all
 dummy:
 
 #
-CONSSRCS = console.c console_conf.c authenticate.c conio.c
-CONSOBJS = console.o console_conf.o authenticate.o conio.o
+CONSSRCS = console.c console_conf.c authenticate.c 
+CONSOBJS = console.o console_conf.o authenticate.o 
 
 # these are the objects that are changed by the .configure process
 EXTRAOBJS = @OBJLIST@

diff --git a/bacula/src/stored/mount.c b/bacula/src/stored/mount.c
index 891cddf76161109b809018bc7e468bd9e4dee663..096a856397bc8c75dcee664b7a7ac500947dd10a 100644 (file)
--- a/bacula/src/stored/mount.c
+++ b/bacula/src/stored/mount.c
@@ -279,6 +279,13 @@ mount_error:
               dev_name(dev), strerror_dev(dev));
            goto mount_next_vol;
         }
+        /* 
+         * We do not return the label in the block, because if we are
+         *  running multiple simultaneous jobs, once we release the lock
+         *  some other thread may write his block over the label. So, 
+         *  we simply write it definitively now.
+         */
+#ifdef needed
         if (!rewind_dev(dev)) {
             Jmsg2(jcr, M_ERROR, 0, _("Unable to rewind device %s. ERR=%s\n"),
               dev_name(dev), strerror_dev(dev));
@@ -287,6 +294,7 @@ mount_error:
 
         /* Recreate a correct volume label and return it in the block */
         write_volume_label_to_block(jcr, dev, block);
+#endif
       }
       /* Set or reset Volume statistics */
       dev->VolCatInfo.VolCatJobs = 0;