Changeset 1687 in MondoRescue for branches/2.2.5/mondo

Timestamp:

Oct 20, 2007, 2:47:12 PM (17 years ago)

Author:

Bruno Cornec

Message:

First attempt to integrate USB support in mondoarchive (may not compile)

Location:

branches/2.2.5/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) (4 diffs)

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

@@ -695 +695 @@
     char *tmp;
     char *tmp1 = NULL;
+    char *tmp2 = NULL;
     char *scratchdir;
     char *command;
@@ -965 +966 @@
         strcpy(value, "dvd");
         break;
+    case usb:
+        strcpy(value, "usb");
+        break;
     default:
         fatal_error("Unknown backup_media_type");
     }
+    if (bkpinfo->backup_media_type == usb) {
+           asprintf(&tmp2, "--usb %s", bkpinfo->media_device);
+   } else {
+           asprintf(&tmp2,"");
+   }
+-
+
     sprintf(tmp, "%s/BACKUP-MEDIA-TYPE", bkpinfo->tmpdir);
     if (write_one_liner_data_file(tmp, value)) {
@@ -1027 +1038 @@
 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
@@ -1323 +1334 @@
         closeout_tape();
     } else
-        /* write final ISO */
+        /* write final ISO/USB */
     {
         res = write_final_iso_if_necessary();

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

@@ -407 +407 @@
     case udev:
         strcpy(output, "udev");
+        break;
+    case usb:
+        strcpy(output, "usb");
         break;
     default:
@@ -1867 +1870 @@
     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?"))
@@ -1893 +1897 @@
                 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/2.2.5/mondo/src/common/libmondo-string.c

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

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

@@ -189 +189 @@
     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;
@@ -328 +329 @@
    * 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/2.2.5/mondo/src/mondoarchive/mondo-cli.c

@@ -551 +551 @@
     }
 
+    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
     {
@@ -613 +624 @@
             }
         }
-    } else {                    /* CD size */
+    } else {                    /* CD|USB size */
         if (flag_set['s']) {
             if (process_the_s_switch(flag_val['s'])) {
@@ -663 +674 @@
     if (flag_set['w']) {
         bkpinfo->backup_media_type = cdrw;
+    }
+    if (flag_set['U']) {
+        bkpinfo->backup_media_type = usb;
     }
     if (flag_set['z']) {
@@ -1027 +1041 @@
     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 == '?') {