Changeset 1956 in MondoRescue for branches/2.2.6/mondo

Timestamp:

May 27, 2008, 6:23:02 PM (17 years ago)

Author:

Bruno Cornec

Message:

Use non-rewinding tape name earlier to pass it to mindi so that at restore time we have the right device name for OBDR

Location:

branches/2.2.6/mondo/src/common

Files:

• libmondo-archive.c (modified) (4 diffs)
• libmondo-stream.c (modified) (2 diffs)

branches/2.2.6/mondo/src/common/libmondo-archive.c

@@ -49 +49 @@
 /*@unused@*/
 //static char cvsid[] = "$Id$";
+//
+extern char *get_non_rewind_dev(char *);
 
 /* *************************** external global vars ******************/
@@ -69 +71 @@
 /* Reference to global bkpinfo */
 extern struct s_bkpinfo *bkpinfo;
-
 
 
@@ -540 +541 @@
     char *value;
     char *bootdev;
+    char *ntapedev = NULL;
 
 
@@ -594 +596 @@
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         sprintf(tape_size_sz, "%ld", bkpinfo->media_size[1]);
+        ntapedev = get_non_rewind_dev(bkpinfo->media_device);
+        if ((bkpinfo->use_obdr) && (ntapedev != NULL)) {
+            strncpy(bkpinfo->media_device,ntapedev,(size_t)(MAX_STR_LEN / 4));
+        } else {
+            if (ntapedev == NULL) {
+                log_it("Not able to create OBDR - Restore will have to be done manually");
+            }
+        }
+        paranoid_free(ntapedev);
         strcpy(tape_device, bkpinfo->media_device);
     } else {

branches/2.2.6/mondo/src/common/libmondo-stream.c

@@ -910 +910 @@
 int openout_tape() {
 
-char *ntapedev = NULL;
-
 g_current_media_number = 1;
 if (g_tape_stream) {
@@ -923 +921 @@
 g_tape_posK = 0;
 
-ntapedev = get_non_rewind_dev(bkpinfo->media_device);
-if ((bkpinfo->use_obdr) && (ntapedev != NULL)) {
-    strncpy(bkpinfo->media_device,ntapedev,(size_t)(MAX_STR_LEN / 4));
+if (bkpinfo->use_obdr) {
     create_obdr();
 } else {
-    if (ntapedev == NULL) {
-        log_it("Not able to create OBDR - Restore will have to be done manually");
-    }
     set_tape_block_size_with_mt(bkpinfo->internal_tape_block_size);
 }
-paranoid_free(ntapedev);
 log_it("Opening OUT tape");
 if (!