Changeset 1949 in MondoRescue for branches/2.2.6/mondo/src/common/libmondo-stream.c

Timestamp:

May 26, 2008, 5:47:22 PM (16 years ago)

Author:

Bruno Cornec

Message:

syntax fixes

File:

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

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

@@ -624 +624 @@
 
 
+/**
+ * Handle OBDR if we were asked to do so
+ * @param tapedev The tape device to open for writing.
+ * @return 0 for success, nonzero for failure.
+ * @note This should be called ONLY from backup processes. It will OVERWRITE ANY
+ * EXISTING DATA on the tape!
+ */
+void skip_obdr(char *tapedev)
+{
+    char *command = NULL;
+    char *ntapedev = NULL;
+
+    ntapedev = get_non_rewind_dev(tapedev);
+    if (ntapedev == NULL) {
+        log_it("Not skipping OBDR");
+    }
+
+    asprintf(&command, "mt -f %s fsf 2", ntapedev);
+    run_program_and_log_output(command, 1);
+    paranoid_free(command);
+
+    paranoid_free(ntapedev);
+}
+
+int create_obdr(char *tapedev)
+{
+
+    char *ntapedev = NULL;
+    char *command = NULL;
+    int res = 0;
+
+    ntapedev = get_non_rewind_dev(tapedev);
+    if (ntapedev == NULL) {
+        log_it("Skipping OBDR");
+        return(1);
+    }
+
+    /* OBDR: First block 10 kB of zero bs = 512 */
+    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);
+    res = run_program_and_log_output(command, 1);
+    paranoid_free(command);
+
+    asprintf(&command, "mt -f %s setblk 512", 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);
+    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", ntapedev, MINDI_CACHE"/mondorescue.iso" );
+    res = run_program_and_log_output(command, 1);
+    paranoid_free(command);
+
+    paranoid_free(ntapedev);
+}
+
 
 /**
@@ -669 +735 @@
     }
     if (bkpinfo->use_obdr) {
-        skip_obdr(tapedev);
+        skip_obdr(bkpinfo->media_device);
     }
 
@@ -830 +896 @@
 }
 
-
-/**
- * Handle OBDR if we were asked to do so
- * @param tapedev The tape device to open for writing.
- * @return 0 for success, nonzero for failure.
- * @note This should be called ONLY from backup processes. It will OVERWRITE ANY
- * EXISTING DATA on the tape!
- */
-void skip_obdr(char *tapedev)
-{
-    char *command = NULL;
-
-    ntapedev = get_non_rewind_dev(tapedev);
-    if (ntapedev == NULL) {
-        log_it("Not skipping OBDR");
-    }
-
-    asprintf(&command, "mt -f %s fsf 2", ntapedev);
-    run_program_and_log_output(command, 1);
-    paranoid_free(command);
-}
-
-int create_obdr(char *tapedev)
-{
-
-    char *ntapedev = NULL;
-    char *command = NULL;
-    int res = 0;
-
-    ntapedev = get_non_rewind_dev(tapedev);
-    if (ntapedev == NULL) {
-        log_it("Skipping OBDR");
-        return(1);
-    }
-
-    /* OBDR: First block 10 kB of zero bs = 512 */
-    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);
-    res = run_program_and_log_output(command, 1);
-    paranoid_free(command);
-
-    asprintf(&command, "mt -f %s setblk 512", 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);
-    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", ntapedev);
-    res = run_program_and_log_output(command, 1);
-    paranoid_free(command);
-
-}
-
 /**
  * Start writing to a tape device for the backup.
@@ -915 +918 @@
     g_tape_posK = 0;
 
-    if (bkpindo->use_obdr) {
+    if (bkpinfo->use_obdr) {
         create_obdr(tapedev);
     }