Changeset 1952 in MondoRescue for branches/2.2.6/mondo

Timestamp:

May 26, 2008, 7:12:52 PM (17 years ago)

Author:

Bruno Cornec

Message:

• Avoid to rewind the tape for OBDR by setting the blocksize in the obdr function on the non-rewinding dev.

File:

• branches/2.2.6/mondo/src/common/libmondo-stream.c (modified) (4 diffs)

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

@@ -693 +693 @@
     }
 
-    asprintf(&command, "mt -f %s fsf 2", ntapedev);
+    asprintf(&command, "mt -f %s fsf 2",ntapedev);
     run_program_and_log_output(command, 1);
     paranoid_free(command);
+
+    set_tape_block_size_with_mt(ntapedev, internal_tape_block_size);
 
     paranoid_free(ntapedev);
@@ -714 +716 @@
 
     /* OBDR: First block 10 kB of zero bs = 512 */
-    asprintf(&command, "mt -f %s compression off", tapedev);
+    asprintf(&command, "mt -f %s compression off",tapedev);
     res = run_program_and_log_output(command, 1);
     paranoid_free(command);
 
-    asprintf(&command, "mt -f %s rewind", tapedev);
+    asprintf(&command, "mt -f %s rewind",tapedev);
     res = run_program_and_log_output(command, 1);
     paranoid_free(command);
 
-    asprintf(&command, "mt -f %s setblk 512", ntapedev);
+    set_tape_block_size_with_mt(ntapedev, 512);
+
+    asprintf(&command, "dd if=/dev/zero of=%s bs=512 count=20",ntapedev);
     res = run_program_and_log_output(command, 1);
     paranoid_free(command);
 
-    asprintf(&command, "dd if=/dev/zero of=%s bs=512 count=20", ntapedev);
+    /* OBDR: then ISO boot image bs = 2048 */
+    set_tape_block_size_with_mt(ntapedev, 2048);
+
+    asprintf(&command, "dd if=%s of=%s bs=2048",MINDI_CACHE"/mondorescue.iso",ntapedev);
     res = run_program_and_log_output(command, 1);
     paranoid_free(command);
 
-    /* OBDR: then ISO boot image bs = 2048 */
-    asprintf(&command, "mt -f %s setblk 2048", ntapedev);
-    res = run_program_and_log_output(command, 1);
-    paranoid_free(command);
-
-    asprintf(&command, "dd if=%s of=%s bs=2048", MINDI_CACHE"/mondorescue.iso", ntapedev );
-    res = run_program_and_log_output(command, 1);
-    paranoid_free(command);
+    set_tape_block_size_with_mt(ntapedev, internal_tape_block_size);
 
     paranoid_free(ntapedev);
@@ -788 +788 @@
     if (bkpinfo->use_obdr) {
         skip_obdr(bkpinfo->media_device);
-    }
+    } else {
+        set_tape_block_size_with_mt(bkpinfo->media_device,
+                                bkpinfo->internal_tape_block_size);
+    }
+
 
     insist_on_this_tape_number(1);
     sprintf(outfname, "%s/tmp/all.tar.gz", bkpinfo->tmpdir);
     make_hole_for_file(outfname);
-
-    set_tape_block_size_with_mt(bkpinfo->media_device,
-                                bkpinfo->internal_tape_block_size);
 
 //  start_buffer_process( bkpinfo->media_device, g_tape_fifo, FALSE);
@@ -924 +925 @@
     if (bkpinfo->use_obdr) {
         create_obdr(tapedev);
-    }
-
-    set_tape_block_size_with_mt(tapedev, internal_tape_block_size);
+    } else {
+        set_tape_block_size_with_mt(tapedev, internal_tape_block_size);
+    }
     log_it("Opening OUT tape");
     if (!