Changeset 2623 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-rstr-compare.c
- Timestamp:
- Apr 12, 2010, 3:23:24 PM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.10/mondo/src/mondorestore/mondo-rstr-compare.c
r2508 r2623 18 18 /* Reference to global bkpinfo */ 19 19 extern struct s_bkpinfo *bkpinfo; 20 21 extern char *g_mountlist_fname;22 20 23 21 //static char cvsid[] = "$Id$"; … … 352 350 assert(bkpinfo != NULL); 353 351 mvaddstr_and_log_it(g_currentY, 0, "Comparing archives"); 354 tmp = read_cfg_var( g_mondo_cfg_file, "last-filelist-number");352 tmp = read_cfg_var(MINDI_CACHE"/mondorestore.cfg", "last-filelist-number"); 355 353 max_val = atol(tmp); 356 354 mr_free(tmp); … … 523 521 524 522 /************************************************************************** 525 * also deletes tmp/filelist.full & tmp/biggielist.txt _and_ tries to *523 * also deletes tmp/filelist.full & biggielist.txt _and_ tries to * 526 524 * restore them from start of tape, if available * 527 525 **************************************************************************/ … … 530 528 assert(raidlist != NULL); 531 529 532 while (get_cfg_file_from_archive()) { 533 if (!ask_me_yes_or_no 534 ("Failed to find config file/archives. Choose another source?")) 535 { 536 fatal_error("Unable to find config file/archives. Aborting."); 537 } 538 interactively_obtain_media_parameters_from_user(FALSE); 539 } 540 541 read_cfg_file_into_bkpinfo(g_mondo_cfg_file); 530 read_cfg_file_into_bkpinfo(MINDI_CACHE"/mondorestore.cfg"); 542 531 543 532 /* edit_mountlist if wanted */ 544 533 log_it("About to edit mountlist"); 545 534 if (g_text_mode) { 546 save_mountlist_to_disk(mountlist, g_mountlist_fname);547 mr_asprintf(tmp, "%s %s", find_my_editor(), g_mountlist_fname);535 save_mountlist_to_disk(mountlist, MINDI_CACHE"/mountlist.txt"); 536 mr_asprintf(tmp, "%s %s", find_my_editor(), MINDI_CACHE"/mountlist.txt"); 548 537 res = system(tmp); 549 538 mr_free(tmp); 550 539 551 load_mountlist(mountlist, g_mountlist_fname);552 } else { 553 res = edit_mountlist( g_mountlist_fname, mountlist, raidlist);540 load_mountlist(mountlist, MINDI_CACHE"/mountlist.txt"); 541 } else { 542 res = edit_mountlist(MINDI_CACHE"/mountlist.txt", mountlist, raidlist); 554 543 } 555 544 log_it("Finished editing mountlist"); … … 557 546 paranoid_MR_finish(1); 558 547 } 559 save_mountlist_to_disk(mountlist, g_mountlist_fname);548 save_mountlist_to_disk(mountlist, MINDI_CACHE"/mountlist.txt"); 560 549 save_raidlist_to_raidtab(raidlist, RAIDTAB_FNAME); 561 550
Note:
See TracChangeset
for help on using the changeset viewer.