Changeset 1079 in MondoRescue for trunk/mondo/src/common

Timestamp:

Jan 28, 2007, 5:58:18 PM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r1045:1078 £SVN_M/branches/stable

Location:

trunk/mondo/src/common

Files:

• Makefile.am (modified) (1 diff)
• crcttt.h (deleted)
• libmondo-archive.c (modified) (6 diffs)
• libmondo-devices.c (modified) (4 diffs)
• libmondo-fifo.c (modified) (1 diff)
• libmondo-fork.c (modified) (1 diff)
• libmondo-raid.c (modified) (1 diff)
• libmondo-tools.c (modified) (1 diff)
• libmondo-verify.c (modified) (1 diff)
• mondostructures.h (modified) (2 diffs)

trunk/mondo/src/common/Makefile.am

@@ +1 @@
+##
+## $Id$
 ##
 ## Process this file with Automake to generate `Makefile.in'

trunk/mondo/src/common/libmondo-archive.c

@@ -32 +32 @@
 #include "libmondo-verify-EXT.h"
 #include "libmondo-archive.h"
+
 #define DVDRWFORMAT 1
 
@@ -544 +545 @@
     char *tmp = NULL;
     char *tmp1 = NULL;
+    char *tmp2 = NULL;
     char *command = NULL;
     char *use_lzo_sz = NULL;
@@ -786 +788 @@
         mr_asprintf(&value, "dvd");
         break;
+    case usb:
+        strcpy(value, "usb");
+        break;
     default:
         fatal_error("Unknown backup_media_type");
@@ -854 +859 @@
     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,"");
+    }
+
     // Watch it! This next line adds a parameter...
     if (bkpinfo->nonbootable_backup) {
@@ -862 +873 @@
 
     mr_asprintf(&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
-             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
-             bkpinfo->image_devs,   // parameter #10
-             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
-             bkpinfo->internal_tape_block_size, // parameter #18 (LONG)
-             bkpinfo->differential, // parameter #19 (INT)
-             use_gzip_sz,       // parameter #20 (STRING)
-             tmp);
+'%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
+            bkpinfo->image_devs,    // parameter #10
+            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
+            bkpinfo->internal_tape_block_size,  // parameter #18 (LONG)
+            bkpinfo->differential,  // parameter #19 (INT)
+            use_gzip_sz,            // parameter #20 (STRING)
+            tmp);
     mr_free(tmp);
     mr_free(tape_size_sz);
@@ -899 +909 @@
     mr_free(use_lilo_sz);
     mr_free(use_gzip_sz);
+    mr_free(tmp2);
 
     log_msg(2, command);

trunk/mondo/src/common/libmondo-devices.c

@@ -1 @@
-/* 
- * $Id$
- * Subroutines for handling devices
- */
+/* libmondo-devices.c                 Subroutines for handling devices
+   $Id$
+*/
+
 /**
  * @file
@@ -1469 +1469 @@
     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?")))
@@ -1490 +1491 @@
                 mr_asprintf(&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 {
                 mr_allocstr(bkpinfo->media_device,VANILLA_SCSI_CDROM );
@@ -1496 +1500 @@
                 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)) {
                     log_to_screen(_("User has chosen not to backup the PC"));

trunk/mondo/src/common/libmondo-fifo.c

@@ -1 +1 @@
 /* $Id$ */
-
 /**
  * @file

trunk/mondo/src/common/libmondo-fork.c

@@ -2 +2 @@
  * $Id$
  */
-
 #include "my-stuff.h"
 #include "mondostructures.h"

trunk/mondo/src/common/libmondo-raid.c

@@ -17 +17 @@
 #include "libmondo-raid.h"
 #include "mr_mem.h"
+#include "mr_str.h"
 
 #ifdef __FreeBSD__

trunk/mondo/src/common/libmondo-tools.c

@@ -181 +181 @@
 
 /**
- * Locate mondoarchive's home directory. Searches in /usr/local/mondo, /usr/share/mondo,
+ * Locate mondoarchive's home directory. Searches in /usr/share/mondo,
  * /usr/local/share/mondo, /opt, or if all else fails, search /usr.
  *

trunk/mondo/src/common/libmondo-verify.c

@@ -1 +1 @@
 /* $Id$ */
-
 /**
  * @file

trunk/mondo/src/common/mondostructures.h

@@ -167 +167 @@
     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;
@@ -312 +313 @@
    * 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.
    */