Changeset 1842 in MondoRescue for branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c
- Timestamp:
- Dec 15, 2007, 2:24:34 AM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c
r1770 r1842 458 458 mr_msg(1, 459 459 "That's OK. I called mount w/o a filesystem type and it worked fine in the end."); 460 } else { 461 log_to_screen("Unable to mount device %s at %s", device, 462 mountdir); 460 463 } 461 464 } … … 475 478 /************************************************************************** 476 479 *END_MOUNT_DEVICE * 477 480 **************************************************************************/ 478 481 479 482 … … 500 503 sizeof(struct mountlist_itself)); 501 504 sort_mountlist_by_mountpoint(mountlist, 0); 505 502 506 503 507 mvaddstr_and_log_it(g_currentY, 0, _("Mounting devices ")); … … 545 549 } 546 550 close_progress_form(); 547 run_program_and_log_output("df -m", TRUE);548 551 if (retval) { 549 552 if (g_partition_table_locked_up > 0) { 550 553 log_to_screen 551 (_ 552 ("fdisk's ioctl() call to refresh its copy of the partition table causes the kernel to")); 553 log_to_screen(_ 554 ("lock up the partition table. You might have to reboot and use Interactive Mode to")); 555 log_to_screen(_ 556 ("format and restore *without* partitioning first. Sorry for the inconvenience.")); 554 (_("fdisk's ioctl() call to refresh its copy of the partition table causes the kernel to")); 555 log_to_screen 556 (_("lock up the partition table. You might have to reboot and use Interactive Mode to")); 557 log_to_screen 558 (_("format and restore *without* partitioning first. Sorry for the inconvenience.")); 557 559 } 558 560 mr_asprintf(&tmp, _("Could not mount devices %s- shall I abort?"), … … 563 565 retval = 0; 564 566 log_to_screen 565 (_ 566 ("Continuing, although some devices failed to be mounted")); 567 (_("Continuing, although some devices failed to be mounted")); 567 568 mvaddstr_and_log_it(g_currentY++, 74, _("Done.")); 568 569 } else { … … 580 581 return (retval); 581 582 } 582 583 584 585 586 587 /* 583 /************************************************************************** 584 *END_MOUNT_ALL_DEVICES * 585 **************************************************************************/ 586 587 588 /** 588 589 * Mount the CD-ROM or USB device at /mnt/cdrom. 589 590 * @param bkpinfo The backup information structure. Fields used: … … 594 595 * @return 0 for success, nonzero for failure. 595 596 */ 596 int mount_media()597 597 { 598 598 char *mount_cmd = NULL; … … 655 655 } else if (bkpinfo->backup_media_type == usb) { 656 656 mr_asprintf(&mount_cmd, "mount -t vfat %s %s", bkpinfo->media_device, MNT_CDROM); 657 } else if (strstr(bkpinfo->media_device, "/dev/")) 657 } else if (strstr(bkpinfo->media_device, "/dev/")) { 658 658 #ifdef __FreeBSD__ 659 {660 659 mr_asprintf(&mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device, 661 660 MNT_CDROM); 662 }663 661 #else 664 {665 662 mr_asprintf(&mount_cmd, "mount %s -t iso9660 -o ro %s", 666 663 bkpinfo->media_device, MNT_CDROM); 667 }668 664 #endif 669 670 else { 665 } else { 671 666 if (bkpinfo->disaster_recovery 672 667 && does_file_exist("/tmp/CDROM-LIVES-HERE")) { … … 704 699 mr_msg(2, "Mounted media OK"); 705 700 } 701 706 702 return (res); 707 703 }
Note:
See TracChangeset
for help on using the changeset viewer.