Changeset 1738 for branches/2.2.5


Ignore:
Timestamp:
Oct 30, 2007, 3:24:36 AM (12 years ago)
Author:
bruno
Message:

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

Location:
branches/2.2.5/mondo/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.5/mondo/src/common/libmondo-devices.c

    r1737 r1738  
    19471947            }
    19481948            if (bkpinfo->media_device[0]) {
    1949                 sprintf(tmp,
     1949                if (bkpinfo->backup_media_type == usb) {
     1950                    sprintf(tmp,
     1951                        "I think your %s media corresponds to %s. Is this correct?",
     1952                        media_descriptor_string(bkpinfo->backup_media_type),
     1953                        bkpinfo->media_device);
     1954                } else {
     1955                    sprintf(tmp,
    19501956                        "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.)",
    19511957                        media_descriptor_string(bkpinfo->backup_media_type),
  • branches/2.2.5/mondo/src/mondorestore/mondo-rstr-tools.c

    r1736 r1738  
    691691        bkpinfo->isodir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
    692692#endif
    693     } else if (strstr(bkpinfo->media_device, "/dev/")) {
     693} else if (bkpinfo->backup_media_type == usb) {
     694        sprintf(mount_cmd, "mount -r %s %s", bkpinfo->media_device, MNT_CDROM);
     695} else if (strstr(bkpinfo->media_device, "/dev/")) {
    694696#ifdef __FreeBSD__
    695697        sprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
     
    708710    }
    709711
    710     if (bkpinfo->backup_media_type == usb) {
    711         sprintf(mount_cmd, "mount -r %s %s", bkpinfo->media_device, MNT_CDROM);
    712     } else {
    713712#ifdef __FreeBSD__
    714         sprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
    715             MNT_CDROM);
     713    sprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
     714        MNT_CDROM);
    716715#else
    717         sprintf(mount_cmd, "mount %s -t iso9660 -o ro %s",
    718             bkpinfo->media_device, MNT_CDROM);
     716    sprintf(mount_cmd, "mount %s -t iso9660 -o ro %s",
     717        bkpinfo->media_device, MNT_CDROM);
    719718#endif
    720719    }
Note: See TracChangeset for help on using the changeset viewer.