Changeset 1709 in MondoRescue for branches/2.2.5

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

Location:

branches/2.2.5/mondo/src/common

Files:

• libmondo-archive.c (modified) (4 diffs)
• libmondo-devices.c (modified) (2 diffs)
• libmondo-verify.c (modified) (1 diff)

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...");

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

@@ -721 +721 @@
 
 
-
-/**
- * Locate a CD-R/W writer's SCSI node.
- * @param cdrw_device SCSI node will be placed here.
- * @return 0 for success, nonzero for failure.
- */
 
 
@@ -1967 +1961 @@
                                              MAX_STR_LEN / 4);
                 } else {
-                    i = popup_and_get_string("/dev entry?",
+                    if (bkpinfo->backup_media_type == usb) {
+                        i = popup_and_get_string("/dev entry?",
+                                             "What is the /dev entry of your USB Disk/Key, please?",
+                                             bkpinfo->media_device,
+                                             MAX_STR_LEN / 4);
+                    } else {
+                        i = popup_and_get_string("/dev entry?",
                                              "What is the /dev entry of your CD (re)writer, please?",
                                              bkpinfo->media_device,
                                              MAX_STR_LEN / 4);
+                    }
                 }
                 if (!i) {

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

@@ -1038 +1038 @@
 
 /**
+ * Verify the USB device
+ * @param bkpinfo The backup information structure. Fields used:
+ * - @c bkpinfo->isodir
+ * - @c bkpinfo->media_device
+ * - @c bkpinfo->tmpdir
+ * - @c bkpinfo->verify_data
+ *
+ * @return 0 for success (even if differences are found), nonzero for failure.
+ * @ingroup verifyGroup
+ */
+int verify_usb_image()
+{
+
+    /*@ int ************************************************************ */
+    int retval = 0;
+
+    /*@ buffers ******************************************************** */
+    char *mountpoint = NULL;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *fname = NULL;
+#ifdef __FreeBSD__
+    char mdd[32];
+    char *mddevice = mdd;
+    int ret = 0;
+    int vndev = 2;
+#else
+//skip
+#endif
+
+    assert(bkpinfo != NULL);
+
+    asprintf(&fname, "%s1", bkpinfo->media_device);
+    if (is_this_device_mounted(fname)) {
+        log_msg(1, "USB device mounted. Remounting it at the right place");
+        asprintf(&tmp, "umount %s", fname);
+        run_program_and_log_output(tmp, FALSE);
+        paranoid_free(tmp);
+    }
+    paranoid_free(fname);
+
+    log_msg(1, "Mounting USB device.");
+    asprintf(&mountpoint, "%s/usb", bkpinfo->tmpdir);
+    asprintf(&tmp, "mkdir -p %s", mountpoint);
+    run_program_and_log_output(tmp, FALSE);
+    paranoid_free(tmp);
+    /* Mindi always create one single parition on the USB dev */
+    asprintf(&tmp, "mount %s1 %s", bkpinfo->media_device, mountpoint);
+    ret = run_program_and_log_output(tmp, FALSE);
+    paranoid_free(tmp);
+    if (ret) {
+        paranoid_free(mountpoint);
+        return(ret);
+    }
+
+    sync();
+    log_msg(2, "OK, I've mounted the USB Disk/Key\n");
+    asprintf(&tmp, "%s/archives/NOT-THE-LAST", mountpoint);
+    if (!does_file_exist(tmp)) {
+        log_msg
+            (2,
+             "This is the last USB device. I am therefore setting bkpinfo->verify_data to FALSE.");
+        bkpinfo->verify_data = FALSE;
+/*
+   (a) It's an easy way to tell the calling subroutine that we've finished &
+   there are no more device to be verified; (b) It stops the post-backup verifier
+   from running after the per-device verifier has run too.
+*/
+    }
+    paranoid_free(tmp);
+    verify_afioballs_on_CD(mountpoint);
+    iamhere("before verify_all_slices");
+    verify_all_slices_on_CD(mountpoint);
+
+    asprintf(&tmp1, "umount %s", mountpoint);
+#ifdef __FreeBSD__
+    ret = 0;
+    ret += system(tmp1);
+    ret += kick_vn(mddevice);
+    if (ret)
+#else
+    if (system(tmp1))
+#endif
+    {
+        asprintf(&tmp, "%s failed; unable to unmount USB device\n", tmp1);
+        log_to_screen(tmp);
+        paranoid_free(tmp);
+        retval++;
+    } else {
+        log_msg(2, "OK, I've unmounted the USB device\n");
+    }
+    paranoid_free(tmp1);
+    paranoid_free(mountpoint);
+    return (retval);
+}
+
+
+/**
  * Verify the CD indicated by @c g_current_media_number.
  * @param bkpinfo The backup information structure. Fields used: