Changeset 1709 in MondoRescue for branches/2.2.5/mondo/src/common/libmondo-verify.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-verify.c (modified) (1 diff)

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: