*/
/*
- Copyright (C) 2002-2005 Kern Sibbald
+ Copyright (C) 2002-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
}
}
+/*
+ * Get storage device name from Storage resource
+ */
+static bool get_storage_device(char *device, char *storage)
+{
+ STORE *store;
+ if (storage[0] == 0) {
+ return false;
+ }
+ store = (STORE *)GetResWithName(R_STORAGE, storage);
+ if (!store) {
+ return false;
+ }
+ DEVICE *dev = (DEVICE *)(store->device->first());
+ if (!dev) {
+ return false;
+ }
+ bstrncpy(device, dev->hdr.name, MAX_NAME_LENGTH);
+ return true;
+}
+
/*
* Our data structures were not designed completely
* correctly, so the file indexes cover the full
* We are called here once for each JobMedia record
* for each Volume.
*/
-static uint32_t write_findex(UAContext *ua, RBSR_FINDEX *fi,
+static uint32_t write_findex(RBSR_FINDEX *fi,
int32_t FirstIndex, int32_t LastIndex, FILE *fd)
{
uint32_t count = 0;
return true;
}
-void make_unique_restore_filename(UAContext *ua, POOLMEM **fname)
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+static uint32_t uniq = 0;
+
+static void make_unique_restore_filename(UAContext *ua, POOL_MEM &fname)
{
JCR *jcr = ua->jcr;
int i = find_arg_with_value(ua, "bootstrap");
Mmsg(fname, "%s", ua->argv[i]);
jcr->unlink_bsr = false;
} else {
- Mmsg(fname, "%s/%s.restore.%s.bsr", working_directory, my_name,
- jcr->Job);
+ P(mutex);
+ uniq++;
+ V(mutex);
+ Mmsg(fname, "%s/%s.restore.%u.bsr", working_directory, my_name, uniq);
jcr->unlink_bsr = true;
}
+ if (jcr->RestoreBootstrap) {
+ free(jcr->RestoreBootstrap);
+ }
+ jcr->RestoreBootstrap = bstrdup(fname.c_str());
}
/*
uint32_t write_bsr_file(UAContext *ua, RESTORE_CTX &rx)
{
FILE *fd;
- POOLMEM *fname = get_pool_memory(PM_MESSAGE);
+ POOL_MEM fname(PM_MESSAGE);
+ POOL_MEM volmsg(PM_MESSAGE);
uint32_t count = 0;;
bool err;
char *p;
JobId_t JobId;
+ char Device[MAX_NAME_LENGTH];
- make_unique_restore_filename(ua, &fname);
- fd = fopen(fname, "w+");
+ make_unique_restore_filename(ua, fname);
+ fd = fopen(fname.c_str(), "w+b");
if (!fd) {
berrno be;
bsendmsg(ua, _("Unable to create bootstrap file %s. ERR=%s\n"),
- fname, be.strerror());
+ fname.c_str(), be.strerror());
goto bail_out;
}
/* Write them to file */
count = write_bsr(ua, rx, fd);
err = ferror(fd);
fclose(fd);
+ if (count == 0) {
+ bsendmsg(ua, _("No files found to restore.\n"));
+ goto bail_out;
+ }
if (err) {
bsendmsg(ua, _("Error writing bsr file.\n"));
count = 0;
}
- bsendmsg(ua, _("Bootstrap records written to %s\n"), fname);
+ bsendmsg(ua, _("Bootstrap records written to %s\n"), fname.c_str());
/* Tell the user what he will need to mount */
bsendmsg(ua, "\n");
- bsendmsg(ua, _("The job will require the following Volumes:\n"));
+ bsendmsg(ua, _("The job will require the following\n"
+ " Volume(s) Storage(s) SD Device(s)\n"
+ "===========================================================================\n"));
/* Create Unique list of Volumes using prompt list */
start_prompt(ua, "");
if (*rx.JobIds) {
}
for (int i=0; i < nbsr->VolCount; i++) {
if (nbsr->VolParams[i].VolumeName[0]) {
- add_prompt(ua, nbsr->VolParams[i].VolumeName);
+ if (!get_storage_device(Device, nbsr->VolParams[i].Storage)) {
+ Device[0] = 0;
+ }
+ Mmsg(volmsg, "%-25.25s %-25.25s %-25.25s",
+ nbsr->VolParams[i].VolumeName,
+ nbsr->VolParams[i].Storage, Device);
+ add_prompt(ua, volmsg.c_str());
}
}
}
for (RBSR *nbsr=rx.bsr; nbsr; nbsr=nbsr->next) {
for (int i=0; i < nbsr->VolCount; i++) {
if (nbsr->VolParams[i].VolumeName[0]) {
- add_prompt(ua, nbsr->VolParams[i].VolumeName);
+ if (!get_storage_device(Device, nbsr->VolParams[i].Storage)) {
+ Device[0] = 0;
+ }
+ Mmsg(volmsg, "%-25.25s %-25.25s %-25.25s",
+ nbsr->VolParams[i].VolumeName,
+ nbsr->VolParams[i].Storage, Device);
+ add_prompt(ua, volmsg.c_str());
}
}
}
bsendmsg(ua, "\n");
bail_out:
- free_pool_memory(fname);
return count;
}
bool first = true;
char *p;
JobId_t JobId;
+ char device[MAX_NAME_LENGTH];
RBSR *bsr;
if (*rx.JobIds == 0) {
for (bsr=rx.bsr; bsr; bsr=bsr->next) {
bsr->VolParams[i].VolumeName[0] = 0; /* zap VolumeName */
continue;
}
+ if (!rx.store) {
+ find_storage_resource(ua, rx, bsr->VolParams[i].Storage,
+ bsr->VolParams[i].MediaType);
+ }
fprintf(fd, "Volume=\"%s\"\n", bsr->VolParams[i].VolumeName);
fprintf(fd, "MediaType=\"%s\"\n", bsr->VolParams[i].MediaType);
+ if (get_storage_device(device, bsr->VolParams[i].Storage)) {
+ fprintf(fd, "Device=\"%s\"\n", device);
+ }
+ if (bsr->VolParams[i].Slot > 0) {
+ fprintf(fd, "Slot=%d\n", bsr->VolParams[i].Slot);
+ }
fprintf(fd, "VolSessionId=%u\n", bsr->VolSessionId);
fprintf(fd, "VolSessionTime=%u\n", bsr->VolSessionTime);
if (bsr->VolParams[i].StartFile == bsr->VolParams[i].EndFile) {
// Dmsg2(100, "bsr VolParam FI=%u LI=%u\n",
// bsr->VolParams[i].FirstIndex, bsr->VolParams[i].LastIndex);
- count = write_findex(ua, bsr->fi, bsr->VolParams[i].FirstIndex,
+ count = write_findex(bsr->fi, bsr->VolParams[i].FirstIndex,
bsr->VolParams[i].LastIndex, fd);
if (count) {
fprintf(fd, "Count=%u\n", count);
bsr->VolParams[i].VolumeName[0] = 0; /* zap VolumeName */
continue;
}
+ if (!rx.store) {
+ find_storage_resource(ua, rx, bsr->VolParams[i].Storage,
+ bsr->VolParams[i].MediaType);
+ }
fprintf(fd, "Volume=\"%s\"\n", bsr->VolParams[i].VolumeName);
fprintf(fd, "MediaType=\"%s\"\n", bsr->VolParams[i].MediaType);
+ if (get_storage_device(device, bsr->VolParams[i].Storage)) {
+ fprintf(fd, "Device=\"%s\"\n", device);
+ }
+ if (bsr->VolParams[i].Slot > 0) {
+ fprintf(fd, "Slot=%d\n", bsr->VolParams[i].Slot);
+ }
fprintf(fd, "VolSessionId=%u\n", bsr->VolSessionId);
fprintf(fd, "VolSessionTime=%u\n", bsr->VolSessionTime);
if (bsr->VolParams[i].StartFile == bsr->VolParams[i].EndFile) {
// Dmsg2(100, "bsr VolParam FI=%u LI=%u\n",
// bsr->VolParams[i].FirstIndex, bsr->VolParams[i].LastIndex);
- count = write_findex(ua, bsr->fi, bsr->VolParams[i].FirstIndex,
+ count = write_findex(bsr->fi, bsr->VolParams[i].FirstIndex,
bsr->VolParams[i].LastIndex, fd);
if (count) {
fprintf(fd, "Count=%u\n", count);
projects / bacula / bacula / blobdiff