Changeset 1709 in MondoRescue for branches/2.2.5/mondo/src/common/libmondo-archive.c

Timestamp:

Oct 27, 2007, 5:07:52 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Verify should now work for USB devices
• More log/mesages improvement for USB support

File:

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

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

@@ -1895 +1895 @@
     log_msg(1, message_to_screen);
 
-    if (is_this_device_mounted(bkpinfo->media_device)) {
+    asprintf(&tmp1, "umount %s1", bkpinfo->media_device);
+    if (is_this_device_mounted(tmp1)) {
         log_msg(1, "USB device mounted. Remounting it at the right place");
-        asprintf(&tmp, "umount %s1", bkpinfo->media_device);
+        asprintf(&tmp, "umount %s", tmp1);
         run_program_and_log_output(tmp, FALSE);
         paranoid_free(tmp);
     }
+    1paranoid_free(tmp);
+
     log_msg(1, "Mounting USB device.");
     asprintf(&tmp1, "%s/usb", bkpinfo->tmpdir);
@@ -3965 +3968 @@
                  media_descriptor_string(g_backup_media_type));
             chdir("/");
-            iamhere("Before calling verify_cd_image()");
-            res += verify_cd_image();
-            iamhere("After calling verify_cd_image()");
+            iamhere("Before calling verification of image()");
+            if (bkpinfo->backup_media_type == usb) {
+                res += verify_usb_image();
+            } else {
+                res += verify_cd_image();
+            }
+            iamhere("After calling verification of image()");
         }
         if (!res) {
             that_one_was_ok = TRUE;
         } else {
-            sprintf(tmp, "Failed to burn %s #%d. Retry?",
+            sprintf(tmp, "Failed to create %s #%d. Retry?",
                     media_descriptor_string(bkpinfo->backup_media_type),
                     g_current_media_number);
@@ -3998 +4005 @@
     g_current_media_number++;
     if (g_current_media_number > MAX_NOOF_MEDIA) {
-        fatal_error("Too many CD-R(W)'s. Use tape or net.");
+        fatal_error("Too many media. Use tape or net.");
     }
     wipe_archives(bkpinfo->scratchdir);
@@ -4010 +4017 @@
 
     if (last_cd) {
-        log_msg(2, "This was your last CD.");
+        log_msg(2, "This was your last media.");
     } else {
         log_msg(2, "Continuing to backup your data...");