extern BSOCK *filed_chan;
extern int r_first, r_last;
extern struct s_res resources[];
-extern char my_name[];
-extern time_t daemon_start_time;
extern struct s_last_job last_job;
extern bool init_done;
int label_status;
int mode;
const char *volname = (relabel == 0) ? newname : oldname;
+ char ed1[50];
steal_device_lock(dev, &hold, BST_WRITING_LABEL);
Dmsg1(100, "Stole device %s lock, writing label.\n", dev->print_name());
Dmsg0(90, "try_autoload_device - looking for volume_info\n");
if (relabel && dev->is_dvd()) {
- dcr->VolCatInfo.VolCatParts=1;
+ dcr->VolCatInfo.VolCatParts=0;
}
if (!try_autoload_device(dcr->jcr, slot, volname)) {
}
bstrncpy(dcr->VolumeName, newname, sizeof(dcr->VolumeName));
/* The following 3000 OK label. string is scanned in ua_label.c */
- bnet_fsend(dir, "3000 OK label. DVD=%d Volume=\"%s\" Device=\"%s\"\n",
- dev->is_dvd()?1:0, newname, dev->print_name());
+ bnet_fsend(dir, "3000 OK label. VolBytes=%s DVD=%d Volume=\"%s\" Device=%s\n",
+ edit_uint64(dev->VolCatInfo.VolCatBytes, ed1),
+ dev->is_dvd()?1:0, newname, dev->print_name());
break;
case VOL_NO_MEDIA:
bnet_fsend(dir, _("3912 Failed to label Volume: ERR=%s\n"), dev->bstrerror());
DCR *dcr;
const char *cmd = NULL;
bool ok = false;
- bool dolist = false;
+ /*
+ * A safe_cmd may call autochanger script but does not load/unload
+ * slots so it can be done at the same time that the drive is open.
+ */
+ bool safe_cmd = false;
if (sscanf(dir->msg, "autochanger list %127s", devname.c_str()) == 1) {
cmd = "list";
- dolist = ok = true;
+ safe_cmd = ok = true;
} else if (sscanf(dir->msg, "autochanger slots %127s", devname.c_str()) == 1) {
cmd = "slots";
- ok = true;
+ safe_cmd = ok = true;
} else if (sscanf(dir->msg, "autochanger drives %127s", devname.c_str()) == 1) {
cmd = "drives";
- ok = true;
+ safe_cmd = ok = true;
}
if (ok) {
dcr = find_device(jcr, devname, -1);
bnet_fsend(dir, _("3995 Device %s is not an autochanger.\n"),
dev->print_name());
/* Under certain "safe" conditions, we can steal the lock */
- } else if (dolist || !dev->is_open() || dev->can_steal_lock()) {
+ } else if (safe_cmd || !dev->is_open() || dev->can_steal_lock()) {
autochanger_cmd(dcr, dir, cmd);
} else if (dev->is_busy() || dev->is_blocked()) {
send_dir_busy_message(dir, dev);