Changeset 1738 in MondoRescue

Timestamp:

Oct 30, 2007, 3:24:36 AM (16 years ago)

Author:

Bruno Cornec

Message:

usb detection place before /dev detection in device name at restore time

Location:

branches/2.2.5/mondo/src

Files:

• common/libmondo-devices.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (2 diffs)

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

@@ -1947 +1947 @@
             }
             if (bkpinfo->media_device[0]) {
-                sprintf(tmp,
+                if (bkpinfo->backup_media_type == usb) {
+                    sprintf(tmp,
+                        "I think your %s media corresponds to %s. Is this correct?",
+                        media_descriptor_string(bkpinfo->backup_media_type),
+                        bkpinfo->media_device);
+                } else {
+                    sprintf(tmp,
                         "I think I've found your %s burner at SCSI node %s. Is this correct? (Say no if you have an IDE burner and you are running a 2.6 kernel. You will then be prompted for further details.)",
                         media_descriptor_string(bkpinfo->backup_media_type),

branches/2.2.5/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -691 +691 @@
         bkpinfo->isodir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
 #endif
-    } else if (strstr(bkpinfo->media_device, "/dev/")) {
+} else if (bkpinfo->backup_media_type == usb) {
+        sprintf(mount_cmd, "mount -r %s %s", bkpinfo->media_device, MNT_CDROM);
+} else if (strstr(bkpinfo->media_device, "/dev/")) {
 #ifdef __FreeBSD__
         sprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
@@ -708 +710 @@
     }
 
-    if (bkpinfo->backup_media_type == usb) {
-        sprintf(mount_cmd, "mount -r %s %s", bkpinfo->media_device, MNT_CDROM);
-    } else {
 #ifdef __FreeBSD__
-        sprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
-            MNT_CDROM);
+    sprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
+        MNT_CDROM);
 #else
-        sprintf(mount_cmd, "mount %s -t iso9660 -o ro %s",
-            bkpinfo->media_device, MNT_CDROM);
+    sprintf(mount_cmd, "mount %s -t iso9660 -o ro %s",
+        bkpinfo->media_device, MNT_CDROM);
 #endif
     }