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

Timestamp:

Jan 20, 2007, 11:37:55 PM (17 years ago)

Author:

Bruno Cornec

Message:

• USB device support for mindi (Tested and Working)
• Begining of USB device support for mondo (maybe not even compiling)
• FindDistroFailsafe build process support
• makemount list doesn't issue weird messages anymore around LVM

File:

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

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

@@ -187 +187 @@
 #include "libmondo-archive.h"
 #include "lib-common-externs.h"
+
+#include "mr_mem.h"
 #include <sys/sem.h>
 #include <sys/types.h>
@@ -694 +696 @@
     char *tmp;
     char *tmp1 = NULL;
+    char *tmp2 = NULL;
     char *scratchdir;
     char *command;
@@ -946 +949 @@
         strcpy(value, "dvd");
         break;
+    case usb:
+        strcpy(value, "usb");
+        break;
     default:
         fatal_error("Unknown backup_media_type");
@@ -1004 +1010 @@
     log_msg(1, "lines_in_filelist = %ld", lines_in_filelist);
 
+    if (bkpinfo->backup_media_type == usb) {
+        asprintf(&tmp2, "--usb %s", bkpinfo->media_device);
+    } else {
+        asprintf(&tmp2,"");
+    }
+
     sprintf(command,
 /*     "mindi --custom 2=%s 3=%s/images 4=\"%s\" 5=\"%s\" \
 6=\"%s\" 7=%ld 8=\"%s\" 9=\"%s\" 10=\"%s\" \
 11=\"%s\" 12=%s 13=%ld 14=\"%s\" 15=\"%s\" 16=\"%s\" 17=\"%s\" 18=%ld 19=%d",*/
-            "mindi --custom %s %s/images '%s' '%s' \
+            "mindi %s --custom '%s' '%s/images' '%s' '%s' \
 '%s' %ld '%s' '%s' '%s' \
-'%s' %s %ld '%s' '%s' '%s' '%s' %ld %d '%s'", bkpinfo->tmpdir,  // parameter #2
+'%s' %s %ld '%s' '%s' '%s' '%s' %ld %d '%s'", 
+            tmp2,
+            bkpinfo->tmpdir,        // parameter #2
             bkpinfo->scratchdir,    // parameter #3
             bkpinfo->kernel_path,   // parameter #4
-            tape_device,        // parameter #5
-            tape_size_sz,       // parameter #6
-            lines_in_filelist,  // parameter #7 (INT)
-            use_lzo_sz,         // parameter #8
-            cd_recovery_sz,     // parameter #9
+            tape_device,            // parameter #5
+            tape_size_sz,           // parameter #6
+            lines_in_filelist,      // parameter #7 (INT)
+            use_lzo_sz,             // parameter #8
+            cd_recovery_sz,         // parameter #9
             bkpinfo->image_devs,    // parameter #10
-            broken_bios_sz,     // parameter #11
+            broken_bios_sz,         // parameter #11
             last_filelist_number,   // parameter #12 (STRING)
             estimated_total_noof_slices,    // parameter #13 (INT)
-            devs_to_exclude,    // parameter #14
-            use_comp_sz,        // parameter #15
-            use_lilo_sz,        // parameter #16
-            use_star_sz,        // parameter #17
+            devs_to_exclude,        // parameter #14
+            use_comp_sz,            // parameter #15
+            use_lilo_sz,            // parameter #16
+            use_star_sz,            // parameter #17
             bkpinfo->internal_tape_block_size,  // parameter #18 (LONG)
             bkpinfo->differential,  // parameter #19 (INT)
-            use_gzip_sz);       // parameter #20 (STRING)
+            use_gzip_sz);           // parameter #20 (STRING)
+
+    mr_free(tmp2);
 
 // Watch it! This next line adds a parameter...