Minor tweaks to Migration

[bacula/bacula] / bacula / src / dird / newvol.c

diff --git a/bacula/src/dird/newvol.c b/bacula/src/dird/newvol.c
index e82d2ebdf28626e671bc46dc60c91b2beb786d77..d022b65a51ebfbadd3fef8e8c35f311762702e30 100644 (file)
--- a/bacula/src/dird/newvol.c
+++ b/bacula/src/dird/newvol.c
@@ -13,22 +13,17 @@
  *   Version $Id$
  */
 /*
-   Copyright (C) 2001-2005 Kern Sibbald
+   Copyright (C) 2000-2006 Kern Sibbald
 
    This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   modify it under the terms of the GNU General Public License
+   version 2 as amended with additional clauses defined in the
+   file LICENSE in the main source directory.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+   the file LICENSE for additional details.
 
  */
 
@@ -62,7 +57,7 @@ bool newVolume(JCR *jcr, MEDIA_DBR *mr)
       memset(mr, 0, sizeof(MEDIA_DBR));
       set_pool_dbr_defaults_in_media_dbr(mr, &pr);
       jcr->VolumeName[0] = 0;
-      bstrncpy(mr->MediaType, jcr->store->media_type, sizeof(mr->MediaType));
+      bstrncpy(mr->MediaType, jcr->wstore->media_type, sizeof(mr->MediaType));
       if (generate_job_event(jcr, "NewVolume") == 1 && jcr->VolumeName[0] &&
           is_volume_name_legal(NULL, jcr->VolumeName)) {
          bstrncpy(mr->VolumeName, jcr->VolumeName, sizeof(mr->VolumeName));
@@ -88,6 +83,7 @@ bool newVolume(JCR *jcr, MEDIA_DBR *mr)
          goto bail_out;
       }
       pr.NumVols++;
+      mr->Enabled = 1;
       if (db_create_media_record(jcr, jcr->db, mr) &&
          db_update_pool_record(jcr, jcr->db, &pr)) {
          db_unlock(jcr->db);