Changeset 1955 in MondoRescue

Timestamp:

May 27, 2008, 1:32:48 PM (17 years ago)

Author:

Bruno Cornec

Message:

• Some log for OBDR
• skip_obdr returns 0 if OK
• Fix typo

File:

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

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

@@ -679 +679 @@
  * @param tapedev The tape device to open for reading.
  */
-void skip_obdr()
+int skip_obdr()
 {
     char *command = NULL;
-
+    int res = 0;
+
+    log_it("Skipping OBDR headers");
     asprintf(&command, "mt -f %s fsf 2",bkpinfo->media_device);
-    run_program_and_log_output(command, 1);
+    res = run_program_and_log_output(command, 1);
     paranoid_free(command);
 
     set_tape_block_size_with_mt(bkpinfo->internal_tape_block_size);
-
+    return(res);
 }
 
@@ -704 +706 @@
     int res = 0;
 
+    log_it("Creating OBDR headers");
     /* OBDR: First block 10 kB of zero bs = 512 */
     asprintf(&command, "mt -f %s compression off",bkpinfo->media_device);
@@ -710 +713 @@
 
     asprintf(&command, "mt -f %s rewind",bkpinfo->media_device);
-    res = run_program_and_log_output(command, 1);
+    res += run_program_and_log_output(command, 1);
     paranoid_free(command);
 
@@ -716 +719 @@
 
     asprintf(&command, "dd if=/dev/zero of=%s bs=512 count=20",bkpinfo->media_device);
-    res = run_program_and_log_output(command, 1);
+    res += run_program_and_log_output(command, 1);
     paranoid_free(command);
 
@@ -723 +726 @@
 
     asprintf(&command, "dd if=%s of=%s bs=2048",MINDI_CACHE"/mondorescue.iso",bkpinfo->media_device);
-    res = run_program_and_log_output(command, 1);
+    res += run_program_and_log_output(command, 1);
     paranoid_free(command);
 
     set_tape_block_size_with_mt(bkpinfo->internal_tape_block_size);
+    return(res);
 }
 
@@ -750 +754 @@
     int i;
     int j;
-    int res;
+    int res = 0;
     long length, templong;
     size_t k;
@@ -777 +781 @@
     if ((bkpinfo->use_obdr) && (ntapedev != NULL)) {
         strncpy(bkpinfo->media_device,ntapedev,(size_t)(MAX_STR_LEN / 4));
-        skip_obdr();
+        res = skip_obdr();
+        if (res != 0) {
+            log_it("Not able to skip OBDR - Restore will have to be done manually");
+        }
     } else {
         if (ntapedev == NULL) {
@@ -930 +937 @@
 if (!
     (g_tape_stream =
-     open_device_via_buffer(tapedev, 'w', bkpinfo->internal_tape_block_size))) {
+     open_device_via_buffer(bkpinfo->media_device, 'w', bkpinfo->internal_tape_block_size))) {
     log_OS_error(g_tape_fifo);
     log_to_screen("Cannot openin stream device");