Changeset 1770 in MondoRescue for branches/stable/mondo/src/mondorestore/mondorestore.c
- Timestamp:
- Nov 6, 2007, 11:01:53 AM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/stable/mondo/src/mondorestore/mondorestore.c
r1769 r1770 437 437 read_cfg_file_into_bkpinfo(g_mondo_cfg_file); 438 438 iamhere("Done loading config file; resizing ML"); 439 mr_asprintf(&tmp,bkpinfo->prefix); 440 if (popup_and_get_string 441 ("Prefix", "Prefix of your ISO images ?", tmp, MAX_STR_LEN / 4)) { 442 mr_free(bkpinfo->prefix); 443 bkpinfo->prefix = tmp; 444 mr_msg(1, "Prefix set to %s",bkpinfo->prefix); 439 if (bkpinfo->backup_media_type != usb) { 440 mr_asprintf(&tmp,bkpinfo->prefix); 441 if (popup_and_get_string 442 ("Prefix", "Prefix of your ISO images ?", tmp, MAX_STR_LEN / 4)) { 443 mr_free(bkpinfo->prefix); 444 bkpinfo->prefix = tmp; 445 mr_msg(1, "Prefix set to %s",bkpinfo->prefix); 446 } 445 447 } 446 448 … … 924 926 if (!g_restoring_live_from_cd) { 925 927 popup_and_OK 926 (_("Please insert tape/CD , then hit 'OK' to continue."));928 (_("Please insert tape/CD/USB key, then hit 'OK' to continue.")); 927 929 sleep(1); 928 930 } … … 2588 2590 mvaddstr_and_log_it(g_currentY, 0, _("Preparing to read your archives")); 2589 2591 if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) { 2590 mount_ cdrom();2592 mount_media(); 2591 2593 mvaddstr_and_log_it(g_currentY++, 0, 2592 2594 _("Restoring OS and data from streaming media")); … … 2606 2608 } else { 2607 2609 mvaddstr_and_log_it(g_currentY++, 0, 2608 _("Restoring OS and data from CD 2609 mount_ cdrom();2610 _("Restoring OS and data from CD/USB ")); 2611 mount_media(); 2610 2612 resA = restore_all_tarballs_from_CD(filelist); 2611 2613 resB = restore_all_biggiefiles_from_CD(filelist); … … 2876 2878 } 2877 2879 mkdir(MNT_CDROM, 0x770); 2880 make_hole_for_dir(MONDO_CACHE); 2878 2881 2879 2882 /* Backup original mountlist.txt */ … … 3155 3158 /* clean up at the end */ 3156 3159 if (retval) { 3157 if (does_file_exist(M INDI_CACHE"/changed.files")) {3160 if (does_file_exist(MONDO_CACHE"/changed.files")) { 3158 3161 log_to_screen 3159 (_("See "M INDI_CACHE"/changed.files for list of files that have changed."));3162 (_("See "MONDO_CACHE"/changed.files for list of files that have changed.")); 3160 3163 } 3161 3164 mvaddstr_and_log_it(g_currentY++,
Note:
See TracChangeset
for help on using the changeset viewer.