Changeset 1063 in MondoRescue for branches/stable/mondo/src

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

Location:

branches/stable/mondo/src

Files:

• common/libmondo-archive.c (modified) (4 diffs)
• common/libmondo-devices.c (modified) (3 diffs)
• common/libmondo-string.c (modified) (1 diff)
• common/mondostructures.h (modified) (2 diffs)
• mondoarchive/mondo-cli.c (modified) (8 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...

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

@@ -1864 +1864 @@
     case cdrw:
     case dvd:
+    case usb:
         if (archiving_to_media) {
-            if (bkpinfo->backup_media_type != dvd) {
+            if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) {
                 if (ask_me_yes_or_no
                     ("Is your computer a laptop, or does the CD writer incorporate BurnProof technology?"))
@@ -1884 +1885 @@
                 sprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE);  // 4.7 salesman's GB = 4.482 real GB = 4582 MB
                 log_msg(1, "Setting to DVD defaults");
+            } else if (bkpinfo->backup_media_type == usb) {
+                strcpy(bkpinfo->media_device, VANILLA_USB_DEVICE);
+                strcpy(sz_size, "512");
             } else {
                 strcpy(bkpinfo->media_device, VANILLA_SCSI_CDROM);
@@ -1890 +1894 @@
                 log_msg(1, "Setting to CD defaults");
             }
-            if (bkpinfo->backup_media_type != dvd) {
+            if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) {
                 if (!popup_and_get_string("Speed", comment, tmp, 4)) {
                     log_to_screen("User has chosen not to backup the PC");

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

@@ -1156 +1156 @@
         strcpy(type_of_backup, "nfs");
         break;
+    case usb:
+        strcpy(type_of_backup, "USB");
+        break;
     default:
         strcpy(type_of_backup, "ISO");

branches/stable/mondo/src/common/mondostructures.h

@@ -184 +184 @@
     nfs,                        ///< Back up to an NFS mount on the local subnet.
     tape,                       ///< Back up to tapes.
+    usb,                        ///< Back up to USB devices.
     udev                        ///< Back up to another unsupported device; just send a stream of bytes.
 } t_bkptype;
@@ -323 +324 @@
    * The device we're backing up to.
    * If backup_media_type is @b cdr, @b cdrw, or @b cdstream, this should be the SCSI node (e.g. 0,1,0).
-   * If backup_media_type is @b dvd, @b tape, or @b udev, this should be a /dev entry.
+   * If backup_media_type is @b dvd, @b tape, @b usb or @b udev, this should be a /dev entry.
    * If backup_media_type is anything else, this should be blank.
    */

branches/stable/mondo/src/mondoarchive/mondo-cli.c

@@ -372 +372 @@
     i = flag_set['c'] + flag_set['i'] + flag_set['n'] +
         flag_set['t'] + flag_set['u'] + flag_set['r'] +
-        flag_set['w'] + flag_set['C'];
+        flag_set['w'] + flag_set['C'] + flag_set['U'];
     if (i == 0) {
         retval++;
@@ -555 +555 @@
     }
 
+    if (flag_set['U'])          // USB
+    {
+        if (! flag_set['d']) {
+            fatal_error
+                ("You need to specify a device file with -d for bootable USB device creation");
+        }
+        if (!flag_set['s']) {
+            fatal_error("You did not specify a size (-s) for your USB device. Aborting");
+        }
+    }
+
     if (flag_set['r'])          // DVD
     {
@@ -617 +628 @@
             }
         }
-    } else {                    /* CD size */
+    } else {                    /* CD|USB size */
         if (flag_set['s']) {
             if (process_the_s_switch(bkpinfo, flag_val['s'])) {
@@ -667 +678 @@
     if (flag_set['w']) {
         bkpinfo->backup_media_type = cdrw;
+    }
+    if (flag_set['U']) {
+        bkpinfo->backup_media_type = usb;
     }
     if (flag_set['z']) {
@@ -791 +805 @@
 
 
-    if (flag_set['d']) {        /* backup directory (if ISO/NFS) */
+    if (flag_set['d']) {        /* backup directory (if ISO/NFS/USB) */
         if (flag_set['i']) {
             strncpy(bkpinfo->isodir, flag_val['d'], MAX_STR_LEN / 4);
@@ -802 +816 @@
             strncpy(bkpinfo->nfs_remote_dir, flag_val['d'], MAX_STR_LEN);
         } else {                /* backup device (if tape/CD-R/CD-RW) */
-
             strncpy(bkpinfo->media_device, flag_val['d'], MAX_STR_LEN / 4);
         }
@@ -820 +833 @@
 
     if (!flag_set['d']
-        && (flag_set['c'] || flag_set['w'] || flag_set['C'])) {
+        && (flag_set['c'] || flag_set['w'] || flag_set['C'] || flag_set['U'])) {
         if (g_kernel_version >= 2.6) {
             if (popup_and_get_string
@@ -1033 +1046 @@
     while ((opt =
             getopt(argc, argv,
-                   "0123456789A:B:C:DE:FGHI:J:K:LNOP:QRS:T:VWb:c:d:ef:gik:l:mn:op:rs:tuw:x:z"))
+                   "0123456789A:B:C:DE:FGHI:J:K:LNOP:QRS:T:UVWb:c:d:ef:gik:l:mn:op:rs:tuw:x:z"))
            != -1) {
         if (opt == '?') {