Add drive name to reserved Volume list printout in SD.

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

diff --git a/bacula/kes-1.37 b/bacula/kes-1.37
index c3ba3e153d743f819afa3ac65447ddaa7212d62d..bd469e473cd8cadc92a140690c7a04c71f458120 100644 (file)
--- a/bacula/kes-1.37
+++ b/bacula/kes-1.37
@@ -4,6 +4,8 @@
 General:
 
 Changes to 1.37.37:
+24Aug05
+- Add drive name to reserved Volume list printout in SD.
 23Aug05
 - Fix bug in acquire.c that incorrectly reported volume
   busy.

diff --git a/bacula/src/stored/reserve.c b/bacula/src/stored/reserve.c
index 79a59044bfe45f071529826c8d7e41596e3b820f..93a0b12f8f52b36e6076433da304ef80e3e149fe 100644 (file)
--- a/bacula/src/stored/reserve.c
+++ b/bacula/src/stored/reserve.c
@@ -204,7 +204,11 @@ void list_volumes(BSOCK *user)
 {
    VOLRES *vol;
    for (vol=(VOLRES *)vol_list->first(); vol; vol=(VOLRES *)vol_list->next(vol)) {
-      bnet_fsend(user, "%s\n", vol->vol_name);
+      if (vol->dev) {
+         bnet_fsend(user, "%s on device %s\n", vol->vol_name, vol->dev->print_name());
+      } else {
+         bnet_fsend(user, "%s\n", vol->vol_name);
+      }
    }
 }
       

diff --git a/bacula/src/stored/status.c b/bacula/src/stored/status.c
index 7b7d3428996b9977dc16fdfc1d8c61a7d3cba72c..ed9cf4bcca9777c13d71d1d73a91a67dc20b2a7e 100644 (file)
--- a/bacula/src/stored/status.c
+++ b/bacula/src/stored/status.c
@@ -156,8 +156,9 @@ bool status_cmd(JCR *jcr)
       }
    }
    bnet_fsend(user, _("====\n\n"));
-   bnet_fsend(user, _("Volume status:\n"));
+   bnet_fsend(user, _("In Use Volume status:\n"));
    list_volumes(user);
+   bnet_fsend(user, _("====\n\n"));
        
 
 #ifdef xxx

diff --git a/bacula/src/version.h b/bacula/src/version.h
index ec394dc757ba278a0939024067b15c7cb3f7ba8f..28e2fb63b6b74c0541c3280bac8ce5a55143a83e 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "1.37.37"
-#define BDATE   "23 August 2005"
-#define LSMDATE "23Aug05"
+#define BDATE   "24 August 2005"
+#define LSMDATE "24Aug05"
 
 /* Debug flags */
 #undef  DEBUG