Changeset 1741 in MondoRescue for branches/2.2.5/mondo/src/common/libmondo-devices.c

Timestamp:

Oct 30, 2007, 11:44:02 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Adds magic file to depllist in order to have file working + ldd which helps for debugging issues
• tty modes correct to avoid sh error messages
• Use ext3 normally and not ext2 instead
• USB device should be corrected after reading (take 1st part)
• Adds a mount_USB_here function derived from mount_CDROM_here

File:

• branches/2.2.5/mondo/src/common/libmondo-devices.c (modified) (2 diffs)

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

@@ -1619 +1619 @@
  * @return 0 for success, nonzero for failure.
  */
+int mount_USB_here(char *device, char *mountpoint)
+{
+    /*@ buffer ****************************************************** */
+    char *command;
+    char *dev;
+    int retval;
+
+    malloc_string(command);
+    malloc_string(dev);
+    malloc_string(options);
+    assert_string_is_neither_NULL_nor_zerolength(device);
+    assert_string_is_neither_NULL_nor_zerolength(mountpoint);
+
+    make_hole_for_dir(mountpoint);
+    if (isdigit(device[0])) {
+        return(1);
+    } else {
+        strcpy(dev, device);
+    }
+    log_msg(4, "(mount_USB_here --- device=%s, mountpoint=%s", device,
+            mountpoint);
+
+#ifdef __FreeBSD__
+    sprintf(command, "mount_vfat %s %s 2>> %s",
+            device, mountpoint, MONDO_LOGFILE);
+
+#else
+    sprintf(command, "mount %s -t vfat %s 2>> %s",
+            device, options, mountpoint, MONDO_LOGFILE);
+#endif
+
+    log_msg(4, command);
+    retval = system(command);
+    log_msg(1, "system(%s) returned %d", command, retval);
+
+    paranoid_free(command);
+    paranoid_free(dev);
+    paranoid_free(options);
+    return (retval);
+}
+
+/**
+ * Mount the CD-ROM at @p mountpoint.
+ * @param device The device (or file if g_ISO_restore_mode) to mount.
+ * @param mountpoint The place to mount it.
+ * @return 0 for success, nonzero for failure.
+ */
 int mount_CDROM_here(char *device, char *mountpoint)
 {
@@ -2647 +2694 @@
     }
     if (!is_this_device_mounted(MNT_CDROM)) {
-        mount_CDROM_here(mountdev, MNT_CDROM);
+        if (bkpinfo->backup_media_type == usb) {
+            mount_USB_here(mountdev, MNT_CDROM);
+        } else {
+            mount_CDROM_here(mountdev, MNT_CDROM);
+        }
     }
     cd_number =