Changeset 1977 in MondoRescue for branches/stable/mondo/src/common/libmondo-archive.c

Timestamp:

Jun 2, 2008, 10:49:01 AM (16 years ago)

Author:

Bruno Cornec

Message:

svn merge -r 1938:1976 $SVN_M/branches/2.2.6

File:

• branches/stable/mondo/src/common/libmondo-archive.c (modified) (9 diffs)

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

@@ -60 +60 @@
 /*@unused@*/
 //static char cvsid[] = "$Id$";
+//
+extern char *get_non_rewind_dev(char *);
 
 /* *************************** external global vars ******************/
@@ -70 +72 @@
 extern long long g_tape_posK;
 extern char *g_tmpfs_mountpt;
-extern bool g_cd_recovery;
 extern char *g_serial_string;
-
 extern char *g_getfacl;
 extern char *g_getfattr;
@@ -79 +79 @@
 /* Reference to global bkpinfo */
 extern struct s_bkpinfo *bkpinfo;
-
 
 
@@ -111 +110 @@
 static int g_sem_id;
 static int g_sem_key;
-
-
-
 
 /**
@@ -540 +536 @@
     char *use_lilo_sz = NULL;
     char *bootdev = NULL;
+    char *ntapedev = NULL;
 
     /*@ char ************************************************************** */
@@ -586 +583 @@
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         mr_asprintf(&tape_size_sz, "%ld", bkpinfo->media_size);
+        ntapedev = get_non_rewind_dev(bkpinfo->media_device);
+        if ((bkpinfo->use_obdr) && (ntapedev != NULL)) {
+            mr_free(bkpinfo->media_device);
+            bkpinfo->media_device = ntapedev;
+        } else {
+            if (ntapedev == NULL) {
+                log_it("Not able to create OBDR - Restore will have to be done manually");
+            }
+        }
         mr_asprintf(&tape_device, bkpinfo->media_device);
     } else {
@@ -858 +864 @@
         mr_fprintf(fd1, "acl=no\n");
     }
+    if (bkpinfo->use_obdr) {
+        asprintf(&tmp1, "%s/OBDR", bkpinfo->tmpdir);
+        if (write_one_liner_data_file(tmp1, "TRUE")) {
+            log_msg(1, "%ld: Unable to write one-liner OBDR",
+                __LINE__);
+        }
+        paranoid_free(tmp1);
+    }
 
     if (g_cd_recovery) {
@@ -1255 +1269 @@
             openout_cdstream(bkpinfo->media_device, bkpinfo->writer_speed);
         } else {
-            openout_tape(bkpinfo->media_device, bkpinfo->internal_tape_block_size); /* sets g_tape_stream */
+            openout_tape(); /* sets g_tape_stream */
         }
         if (!g_tape_stream) {
@@ -2144 +2158 @@
         /* copy to CD (scratchdir) ... and an actual CD-R if necessary */
         if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-            register_in_tape_catalog(fileset, curr_set_no, -1,
-                                     curr_afioball_fname);
-            maintain_collection_of_recent_archives(bkpinfo->tmpdir,
-                                                   curr_afioball_fname);
+            register_in_tape_catalog(fileset, curr_set_no, -1, curr_afioball_fname);
+            maintain_collection_of_recent_archives(bkpinfo->tmpdir, curr_afioball_fname);
             iamhere("Writing EXAT files");
             res +=