Changeset 2227 in MondoRescue for branches/2.2.9/mondo/src/mondorestore
- Timestamp:
- Jun 17, 2009, 2:45:52 PM (15 years ago)
- Location:
- branches/2.2.9/mondo/src/mondorestore
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.9/mondo/src/mondorestore/mondo-prep.c
r2222 r2227 240 240 241 241 // do_this_last[0] = '\0'; 242 iamhere("STARTING");242 log_it("%s","STARTING"); 243 243 log_msg(1, "OK, opened i-want-my-lvm. Shutting down LVM volumes..."); 244 244 if (find_home_of_exe("lvm")) // found it :) cool … … 417 417 system("sync"); 418 418 sleep(1); 419 iamhere("ENDING");419 log_it("%s","ENDING"); 420 420 if (retval > 2) { 421 421 log_msg(1, "%d errors. I'm reporting this.", retval); … … 1613 1613 system("sync"); 1614 1614 #else 1615 iamhere("New, kernel-friendly partition remover");1615 log_it("%s","New, kernel-friendly partition remover"); 1616 1616 for (i = 20; i > 0; i--) { 1617 1617 fprintf(pout_to_fdisk, "d\n%d\n", i); … … 2591 2591 log_it("--- Hugo, 2002/11/20"); 2592 2592 } 2593 iamhere("Resizing mountlist");2593 log_it("%s","Resizing mountlist"); 2594 2594 make_list_of_drives_in_mountlist(mountlist, drivelist); 2595 iamhere("Back from MLoDiM");2595 log_it("%s","Back from MLoDiM"); 2596 2596 for (driveno = 0; driveno < drivelist->entries; driveno++) { 2597 2597 resize_drive_proportionately_to_suit_new_drives(mountlist, -
branches/2.2.9/mondo/src/mondorestore/mondo-rstr-compare.c
r2211 r2227 576 576 577 577 /* edit_mountlist if wanted */ 578 iamhere("About to edit mountlist");578 log_it("%s","About to edit mountlist"); 579 579 if (g_text_mode) { 580 580 save_mountlist_to_disk(mountlist, g_mountlist_fname); … … 585 585 res = edit_mountlist(g_mountlist_fname, mountlist, raidlist); 586 586 } 587 iamhere("Finished editing mountlist");587 log_it("%s","Finished editing mountlist"); 588 588 if (res) { 589 589 paranoid_MR_finish(1); … … 594 594 g_current_media_number = 1; 595 595 mvaddstr_and_log_it(1, 30, "Comparing Automatically"); 596 iamhere("Pre-MAD");596 log_it("%s","Pre-MAD"); 597 597 retval = mount_all_devices(mountlist, FALSE); 598 iamhere("Post-MAD");598 log_it("%s","Post-MAD"); 599 599 if (retval) { 600 600 unmount_all_devices(mountlist); -
branches/2.2.9/mondo/src/mondorestore/mondo-rstr-newt.c
r2211 r2227 2067 2067 int res = 0; 2068 2068 2069 iamhere("entering eml");2069 log_it("%s","entering eml"); 2070 2070 2071 2071 if (g_text_mode) { … … 2076 2076 res = edit_mountlist_in_newt(mountlist_fname, mountlist, raidlist); 2077 2077 } 2078 iamhere("leaving eml");2078 log_it("%s","leaving eml"); 2079 2079 return (res); 2080 2080 } … … 2732 2732 assert(disklist != NULL); 2733 2733 2734 iamhere("malloc'ing");2734 log_it("%s","malloc'ing"); 2735 2735 malloc_string(tmp); 2736 2736 malloc_string(help_text); … … 2760 2760 sizeof(struct list_of_disks)); 2761 2761 2762 iamhere("Post-malloc");2762 log_it("%s","Post-malloc"); 2763 2763 strcpy(help_text, 2764 2764 " Edit this RAID device's list of partitions. Choose OK or Cancel when done."); -
branches/2.2.9/mondo/src/mondorestore/mondo-rstr-tools.c
r2211 r2227 1566 1566 0, 1567 1567 "Running GRUB... "); 1568 iamhere(command);1568 log_it("%s",command); 1569 1569 res = run_program_and_log_output(command, 1); 1570 1570 if (res) { … … 2311 2311 MONDO_CFG_FILE_STUB); 2312 2312 sprintf(command, "cp -f %s %s", tmp, cfg_file); 2313 iamhere(command);2313 log_it("%s",command); 2314 2314 if (strcmp(tmp, cfg_file) 2315 2315 && run_program_and_log_output(command, 1)) { … … 2323 2323 call_program_and_get_last_line_of_output("pwd"), 2324 2324 MOUNTLIST_FNAME_STUB, mountlist_file); 2325 iamhere(command);2325 log_it("%s",command); 2326 2326 if (extract_mountlist_stub) { 2327 2327 if (strcmp(tmp, cfg_file) … … 2344 2344 run_program_and_log_output("umount " MNT_CDROM, FALSE); 2345 2345 if (!does_file_exist(cfg_file)) { 2346 iamhere(cfg_file);2346 log_it("%s",cfg_file); 2347 2347 log_msg(1, "%s not found", cfg_file); 2348 2348 log_to_screen … … 2419 2419 2420 2420 assert(wait_for_percentage <= 100); 2421 iamhere("wait_until_software_raids_are_prepped");2421 log_it("%s","wait_until_software_raids_are_prepped"); 2422 2422 while (unfinished_mdstat_devices > 0) { 2423 2423 // FIXME: Prefix '/dev/' should really be dynamic! -
branches/2.2.9/mondo/src/mondorestore/mondorestore.c
r2211 r2227 262 262 int retval = 0; 263 263 264 iamhere("inside catchall");264 log_it("%s","inside catchall"); 265 265 assert(bkpinfo != NULL); 266 266 assert(mountlist != NULL); 267 267 assert(raidlist != NULL); 268 268 malloc_string(tmp); 269 iamhere("pre wrm");269 log_it("%s","pre wrm"); 270 270 c = which_restore_mode(); 271 iamhere("post wrm");271 log_it("%s","post wrm"); 272 272 if (c == 'I' || c == 'C') { 273 273 interactively_obtain_media_parameters_from_user(FALSE); … … 286 286 } 287 287 288 iamhere("post int");288 log_it("%s","post int"); 289 289 290 290 if (bkpinfo->backup_media_type == iso) { … … 465 465 } 466 466 467 iamhere("About to load config file");467 log_it("%s","About to load config file"); 468 468 get_cfg_file_from_archive_or_bust(); 469 469 read_cfg_file_into_bkpinfo(g_mondo_cfg_file); 470 iamhere("Done loading config file; resizing ML");470 log_it("%s","Done loading config file; resizing ML"); 471 471 if (bkpinfo->backup_media_type == nfs) { 472 472 strcpy(tmp, bkpinfo->prefix); … … 493 493 } 494 494 for (done = FALSE; !done;) { 495 iamhere("About to edit mountlist");495 log_it("%s","About to edit mountlist"); 496 496 if (g_text_mode) { 497 497 save_mountlist_to_disk(mountlist, g_mountlist_fname); … … 502 502 res = edit_mountlist(g_mountlist_fname, mountlist, raidlist); 503 503 } 504 iamhere("Finished editing mountlist");504 log_it("%s","Finished editing mountlist"); 505 505 if (res) { 506 506 paranoid_MR_finish(1); … … 681 681 } 682 682 683 iamhere("About to leave interactive_mode()");683 log_it("%s","About to leave interactive_mode()"); 684 684 if (retval) { 685 685 mvaddstr_and_log_it(g_currentY++, … … 691 691 paranoid_free(fstab_fname); 692 692 paranoid_free(old_restpath); 693 iamhere("Leaving interactive_mode()");693 log_it("%s","Leaving interactive_mode()"); 694 694 return (retval); 695 695 } … … 885 885 return (retval); 886 886 } 887 iamhere("Restoring everything");887 log_it("%s","Restoring everything"); 888 888 retval += restore_everything(NULL); 889 889 clean_multipathconf(); … … 1006 1006 "Restore files to where? )", 1007 1007 bkpinfo->restore_path, MAX_STR_LEN / 4)) { 1008 iamhere("Restoring everything");1008 log_it("%s","Restoring everything"); 1009 1009 retval += restore_everything(filelist); 1010 1010 free_filelist(filelist); … … 2035 2035 2036 2036 if (g_getfattr) { 2037 iamhere("Restoring xattr stuff");2037 log_it("%s","Restoring xattr stuff"); 2038 2038 res = set_fattr_list(filelist_subset_fname, xattr_fname); 2039 2039 if (res) { … … 2046 2046 2047 2047 if (g_getfacl) { 2048 iamhere("Restoring acl stuff");2048 log_it("%s","Restoring acl stuff"); 2049 2049 res = set_acl_list(filelist_subset_fname, acl_fname); 2050 2050 if (res) { … … 2182 2182 res = 2183 2183 restore_a_biggiefile_from_CD(bigfileno, filelist, pathname_of_last_biggie_restored); 2184 iamhere(pathname_of_last_biggie_restored);2184 log_it("%s",pathname_of_last_biggie_restored); 2185 2185 if (fbw && pathname_of_last_biggie_restored[0]) { 2186 2186 fprintf(fbw, "%s\n", pathname_of_last_biggie_restored); … … 2505 2505 fclose(fbw); 2506 2506 if (length_of_file(biggies_whose_EXATs_we_should_set) > 2) { 2507 iamhere("Setting biggie-EXATs");2507 log_it("%s","Setting biggie-EXATs"); 2508 2508 if (g_getfattr) { 2509 2509 if (length_of_file(xattr_fname) > 0) { … … 2522 2522 } 2523 2523 } else { 2524 iamhere2524 log_it("%s", 2525 2525 ("No biggiefiles selected. So, no biggie-EXATs to set."); 2526 2526 } … … 2631 2631 } 2632 2632 if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) { 2633 iamhere("Reading EXAT files from tape");2633 log_it("%s","Reading EXAT files from tape"); 2634 2634 res = 2635 2635 read_EXAT_files_from_tape(&tmp_size, tmp_fname, … … 2945 2945 } 2946 2946 2947 iamhere("what time is it");2947 log_it("%s","what time is it"); 2948 2948 2949 2949 /* Process command-line parameters */ … … 3128 3128 log_msg(2, "FYI, MOUNTLIST_FNAME = %s ", g_mountlist_fname); 3129 3129 3130 iamhere("About to call load_mountlist and load_raidtab");3130 log_it("%s","About to call load_mountlist and load_raidtab"); 3131 3131 strcpy(bkpinfo->restore_path, MNT_RESTORING); 3132 3132 read_cfg_file_into_bkpinfo(g_mondo_cfg_file); 3133 3133 retval = load_mountlist(mountlist, g_mountlist_fname); 3134 3134 retval += load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME); 3135 iamhere 3136 ("Returned from calling load_mountlist and load_raidtab successfully"); 3135 log_it("%s","Returned from calling load_mountlist and load_raidtab successfully"); 3137 3136 3138 3137 // BCO:To be reviewed … … 3158 3157 3159 3158 if (bkpinfo->restore_mode == nuke) { 3160 iamhere("nuking");3159 log_it("%s","nuking"); 3161 3160 retval += nuke_mode(mountlist, raidlist); 3162 3161 } else if (bkpinfo->restore_mode == interactive) { 3163 iamhere("catchall");3162 log_it("%s","catchall"); 3164 3163 retval += catchall_mode(mountlist, raidlist); 3165 3164 } else if (bkpinfo->restore_mode == compare) { 3166 iamhere("compare");3165 log_it("%s","compare"); 3167 3166 retval += compare_mode(mountlist, raidlist); 3168 3167 } else if (bkpinfo->restore_mode == isoonly) { 3169 iamhere("iso");3168 log_it("%s","iso"); 3170 3169 retval = iso_mode(mountlist, raidlist, FALSE); 3171 3170 } else if (bkpinfo->restore_mode == mbr) { 3172 iamhere("mbr");3171 log_it("%s","mbr"); 3173 3172 retval = mount_all_devices(mountlist, TRUE); 3174 3173 if (!retval) { … … 3180 3179 } 3181 3180 } else if (bkpinfo->restore_mode == isonuke) { 3182 iamhere("isonuke");3181 log_it("%s","isonuke"); 3183 3182 retval = iso_mode(mountlist, raidlist, TRUE); 3184 3183 } else { 3185 iamhere("catchall (no mode specified in command-line call");3184 log_it("%s","catchall (no mode specified in command-line call"); 3186 3185 retval += catchall_mode(mountlist, raidlist); 3187 3186 }
Note:
See TracChangeset
for help on using the changeset viewer.