Changeset 1663 in MondoRescue for branches/stable/mondo/src/mondorestore/mondorestore.c
- Timestamp:
- Sep 27, 2007, 12:21:18 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/stable/mondo/src/mondorestore/mondorestore.c
r1639 r1663 35 35 36 36 extern void twenty_seconds_til_yikes(void); 37 38 /* Reference to global bkpinfo */ 39 struct s_bkpinfo *bkpinfo; 37 40 38 41 /* For use in other programs (ex. XMondo) */ … … 205 208 * @ingroup restoreGuiGroup 206 209 */ 207 int let_user_edit_the_mountlist(struct s_bkpinfo *bkpinfo, 208 struct mountlist_itself *mountlist, 210 int let_user_edit_the_mountlist(struct mountlist_itself *mountlist, 209 211 struct raidlist_itself *raidlist) 210 212 { … … 306 308 */ 307 309 int 308 catchall_mode(struct s_bkpinfo *bkpinfo, 309 struct mountlist_itself *mountlist, 310 catchall_mode(struct mountlist_itself *mountlist, 310 311 struct raidlist_itself *raidlist) 311 312 { … … 321 322 iamhere("post wrm"); 322 323 if (c == 'I' || c == 'N' || c == 'C') { 323 interactively_obtain_media_parameters_from_user( bkpinfo,FALSE);324 interactively_obtain_media_parameters_from_user(FALSE); 324 325 } else { 325 326 popup_and_OK(_("No restoring or comparing will take place today.")); … … 338 339 339 340 if (bkpinfo->backup_media_type == iso) { 340 if (iso_fiddly_bits( bkpinfo,(c == 'N') ? TRUE : FALSE)) {341 if (iso_fiddly_bits((c == 'N') ? TRUE : FALSE)) { 341 342 mr_msg(2, 342 343 "catchall_mode --- iso_fiddly_bits returned w/ error"); … … 349 350 if (c == 'I') { 350 351 mr_msg(2, "IM selected"); 351 retval += interactive_mode( bkpinfo,mountlist, raidlist);352 retval += interactive_mode(mountlist, raidlist); 352 353 } else if (c == 'N') { 353 354 mr_msg(2, "NM selected"); 354 retval += nuke_mode( bkpinfo,mountlist, raidlist);355 retval += nuke_mode(mountlist, raidlist); 355 356 } else if (c == 'C') { 356 357 mr_msg(2, "CM selected"); 357 retval += compare_mode( bkpinfo,mountlist, raidlist);358 retval += compare_mode(mountlist, raidlist); 358 359 } 359 360 return (retval); … … 368 369 **************************************************************************/ 369 370 370 static void clean_blkid( struct s_bkpinfo *bkpinfo) {371 static void clean_blkid() { 371 372 372 373 char *tmp1 = NULL; … … 396 397 */ 397 398 int 398 interactive_mode(struct s_bkpinfo *bkpinfo, 399 struct mountlist_itself *mountlist, 399 interactive_mode(struct mountlist_itself *mountlist, 400 400 struct raidlist_itself *raidlist) 401 401 { … … 434 434 435 435 iamhere("About to load config file"); 436 get_cfg_file_from_archive_or_bust( bkpinfo);437 read_cfg_file_into_bkpinfo(g_mondo_cfg_file , bkpinfo);436 get_cfg_file_from_archive_or_bust(); 437 read_cfg_file_into_bkpinfo(g_mondo_cfg_file); 438 438 iamhere("Done loading config file; resizing ML"); 439 439 mr_asprintf(&tmp,bkpinfo->prefix); … … 560 560 { 561 561 mr_msg(1, "Restoring all data"); 562 retval += restore_everything( bkpinfo,NULL);562 retval += restore_everything(NULL); 563 563 } else if ((restore_all = 564 564 ask_me_yes_or_no … … 567 567 for (done = FALSE; !done;) { 568 568 unlink("/tmp/filelist.full"); 569 filelist = process_filelist_and_biggielist( bkpinfo);569 filelist = process_filelist_and_biggielist(); 570 570 /* Now you have /tmp/tmpfs/filelist.restore-these and /tmp/tmpfs/biggielist.restore-these; 571 571 the former is a list of regular files; the latter, biggiefiles and imagedevs. … … 587 587 strcpy(bkpinfo->restore_path, tmp1); 588 588 mr_msg(1, "Restoring subset"); 589 retval += restore_everything( bkpinfo,filelist);589 retval += restore_everything(filelist); 590 590 free_filelist(filelist); 591 591 } else { … … 622 622 } 623 623 624 clean_blkid( bkpinfo);624 clean_blkid(); 625 625 protect_against_braindead_sysadmins(); 626 626 retval += unmount_all_devices(mountlist); … … 671 671 * Run an arbitrary restore mode (prompt the user), but from ISO images 672 672 * instead of real media. 673 * @param bkpinfo The backup information structure. Most fields are used.674 673 * @param mountlist The mountlist containing information about the user's partitions. 675 674 * @param raidlist The raidlist that goes with @p mountlist. … … 678 677 */ 679 678 int 680 iso_mode(struct s_bkpinfo *bkpinfo, 681 struct mountlist_itself *mountlist, 679 iso_mode(struct mountlist_itself *mountlist, 682 680 struct raidlist_itself *raidlist, bool nuke_me_please) 683 681 { … … 685 683 int retval = 0; 686 684 687 assert(bkpinfo != NULL);688 685 assert(mountlist != NULL); 689 686 assert(raidlist != NULL); 690 if (iso_fiddly_bits( bkpinfo,nuke_me_please)) {687 if (iso_fiddly_bits(nuke_me_please)) { 691 688 mr_msg(1, "iso_mode --- returning w/ error"); 692 689 return (1); … … 694 691 c = which_restore_mode(); 695 692 if (c == 'I' || c == 'N' || c == 'C') { 696 interactively_obtain_media_parameters_from_user(bkpinfo, 697 FALSE); 693 interactively_obtain_media_parameters_from_user(FALSE); 698 694 } 699 695 if (c == 'I') { 700 retval += interactive_mode( bkpinfo,mountlist, raidlist);696 retval += interactive_mode(mountlist, raidlist); 701 697 } else if (c == 'N') { 702 retval += nuke_mode( bkpinfo,mountlist, raidlist);698 retval += nuke_mode(mountlist, raidlist); 703 699 } else if (c == 'C') { 704 retval += compare_mode( bkpinfo,mountlist, raidlist);700 retval += compare_mode(mountlist, raidlist); 705 701 } else { 706 702 log_to_screen(_("OK, I shan't restore/compare any files.")); … … 761 757 */ 762 758 int 763 nuke_mode(struct s_bkpinfo *bkpinfo, 764 struct mountlist_itself *mountlist, 759 nuke_mode(struct mountlist_itself *mountlist, 765 760 struct raidlist_itself *raidlist) 766 761 { … … 778 773 mr_msg(2, "nuke_mode --- starting"); 779 774 780 get_cfg_file_from_archive_or_bust( bkpinfo);775 get_cfg_file_from_archive_or_bust(); 781 776 load_mountlist(mountlist, g_mountlist_fname); // in case read_cfg_file_into_bkpinfo updated the mountlist 782 777 #ifdef __FreeBSD__ … … 796 791 if (ask_me_yes_or_no(tmp)) { 797 792 mr_free(tmp); 798 retval = interactive_mode( bkpinfo,mountlist, raidlist);793 retval = interactive_mode(mountlist, raidlist); 799 794 call_me_after_the_nuke(retval); 800 795 return(retval); … … 852 847 853 848 if (ask_me_yes_or_no(_("Try in interactive mode instead?"))) { 854 retval = interactive_mode( bkpinfo,mountlist, raidlist);849 retval = interactive_mode(mountlist, raidlist); 855 850 call_me_after_the_nuke(retval); 856 851 return(retval); … … 869 864 } 870 865 iamhere("Restoring everything"); 871 retval += restore_everything( bkpinfo,NULL);866 retval += restore_everything(NULL); 872 867 if (!run_boot_loader(FALSE)) { 873 868 mr_msg(1, … … 875 870 boot_loader_installed = TRUE; 876 871 } 877 clean_blkid( bkpinfo);872 clean_blkid(); 878 873 protect_against_braindead_sysadmins(); 879 874 retval += unmount_all_devices(mountlist); … … 910 905 * @return 0 for success, or the number of errors encountered. 911 906 */ 912 int restore_to_live_filesystem( struct s_bkpinfo *bkpinfo)907 int restore_to_live_filesystem() 913 908 { 914 909 int retval = 0; … … 932 927 sleep(1); 933 928 } 934 interactively_obtain_media_parameters_from_user( bkpinfo,FALSE);929 interactively_obtain_media_parameters_from_user(FALSE); 935 930 if (!bkpinfo->media_device) { 936 931 mr_msg(2, "Warning - failed to find media dev"); … … 944 939 open_evalcall_form(_("Thinking...")); 945 940 946 get_cfg_file_from_archive_or_bust( bkpinfo);947 read_cfg_file_into_bkpinfo(g_mondo_cfg_file , bkpinfo);941 get_cfg_file_from_archive_or_bust(); 942 read_cfg_file_into_bkpinfo(g_mondo_cfg_file); 948 943 load_mountlist(mountlist, g_mountlist_fname); // in case read_cfg_file_into_bkpinfo 949 944 … … 951 946 retval = load_mountlist(mountlist, g_mountlist_fname); 952 947 load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME); 953 filelist = process_filelist_and_biggielist( bkpinfo);948 filelist = process_filelist_and_biggielist(); 954 949 if (filelist) { 955 950 save_filelist(filelist, "/tmp/selected-files.txt"); … … 959 954 bkpinfo->restore_path, MAX_STR_LEN)) { 960 955 iamhere("Restoring everything"); 961 retval += restore_everything( bkpinfo,filelist);956 retval += restore_everything(filelist); 962 957 } 963 958 free_filelist(filelist); … … 1006 1001 */ 1007 1002 int 1008 restore_a_biggiefile_from_CD(struct s_bkpinfo *bkpinfo, 1009 long bigfileno, 1003 restore_a_biggiefile_from_CD(long bigfileno, 1010 1004 struct s_node *filelist, 1011 1005 char *pathname_of_last_file_restored) … … 1178 1172 bkpinfo->backup_media_string, 1179 1173 g_current_media_number); 1180 insist_on_this_cd_number( bkpinfo,g_current_media_number);1174 insist_on_this_cd_number(g_current_media_number); 1181 1175 log_to_screen(_("Continuing to restore.")); 1182 1176 } else { … … 1307 1301 * @return 0 for success (or skip), nonzero for failure. 1308 1302 */ 1309 int restore_a_biggiefile_from_stream( struct s_bkpinfo *bkpinfo,char *orig_bf_fname, long biggiefile_number, char *orig_checksum, //UNUSED1303 int restore_a_biggiefile_from_stream(char *orig_bf_fname, long biggiefile_number, char *orig_checksum, //UNUSED 1310 1304 long long biggiefile_size, //UNUSED 1311 1305 struct s_node *filelist, … … 1474 1468 if (current_slice_number == 0) { 1475 1469 res = 1476 read_file_from_stream_to_file(bkpinfo, 1477 "/tmp/biggie-blah.txt", 1470 read_file_from_stream_to_file("/tmp/biggie-blah.txt", 1478 1471 slice_siz); 1479 1472 if (!(fin = fopen("/tmp/biggie-blah.txt", "r"))) { … … 1491 1484 } else { 1492 1485 res = 1493 read_file_from_stream_to_stream( bkpinfo,pout, slice_siz);1486 read_file_from_stream_to_stream(pout, slice_siz); 1494 1487 } 1495 1488 retval += res; … … 1776 1769 */ 1777 1770 int 1778 restore_a_tarball_from_stream(struct s_bkpinfo *bkpinfo, 1779 char *tarball_fname, 1771 restore_a_tarball_from_stream(char *tarball_fname, 1780 1772 long current_tarball_number, 1781 1773 struct s_node *filelist, … … 1817 1809 mr_asprintf(&filelist_subset_fname, "%s/filelist-subset-%ld.tmp", 1818 1810 bkpinfo->tmpdir, current_tarball_number); 1819 res = read_file_from_stream_to_file( bkpinfo,afio_fname, size);1811 res = read_file_from_stream_to_file(afio_fname, size); 1820 1812 if (strstr(tarball_fname, ".star")) { 1821 1813 bkpinfo->use_star = TRUE; … … 1951 1943 */ 1952 1944 int 1953 restore_all_biggiefiles_from_CD(struct s_bkpinfo *bkpinfo, 1954 struct s_node *filelist) 1945 restore_all_biggiefiles_from_CD(struct s_node *filelist) 1955 1946 { 1956 1947 int retval = 0; … … 2018 2009 "I'll continue to scan this CD for bigfiles to be restored."); 2019 2010 } else if (does_file_exist(MNT_CDROM "/archives/NOT-THE-LAST")) { 2020 insist_on_this_cd_number(bkpinfo, 2021 ++g_current_media_number); 2011 insist_on_this_cd_number(++g_current_media_number); 2022 2012 log_to_screen(_("Restoring from %s #%d"), 2023 bkpinfo->backup_media_string,2013 media_descriptor_string(bkpinfo->backup_media_type), 2024 2014 g_current_media_number); 2025 2015 just_changed_cds = TRUE; … … 2037 2027 2038 2028 res = 2039 restore_a_biggiefile_from_CD(bkpinfo, bigfileno, filelist, 2040 pathname_of_last_biggie_restored); 2029 restore_a_biggiefile_from_CD(bigfileno, filelist, pathname_of_last_biggie_restored); 2041 2030 iamhere(pathname_of_last_biggie_restored); 2042 2031 if (fbw && pathname_of_last_biggie_restored[0]) { … … 2097 2086 */ 2098 2087 int 2099 restore_all_tarballs_from_CD(struct s_bkpinfo *bkpinfo, 2100 struct s_node *filelist) 2088 restore_all_tarballs_from_CD(struct s_node *filelist) 2101 2089 { 2102 2090 int retval = 0; … … 2126 2114 g_current_media_number = 1; 2127 2115 } 2128 insist_on_this_cd_number( bkpinfo,g_current_media_number);2116 insist_on_this_cd_number(g_current_media_number); 2129 2117 read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp1); 2130 2118 max_val = atol(tmp1) + 1; … … 2140 2128 progress_str, max_val); 2141 2129 for (;;) { 2142 insist_on_this_cd_number( bkpinfo,g_current_media_number);2130 insist_on_this_cd_number(g_current_media_number); 2143 2131 update_progress_form(progress_str); 2144 2132 mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.afio.bz2", … … 2252 2240 */ 2253 2241 int 2254 restore_all_biggiefiles_from_stream(struct s_bkpinfo *bkpinfo, 2255 struct s_node *filelist) 2242 restore_all_biggiefiles_from_stream(struct s_node *filelist) 2256 2243 { 2257 2244 long noof_biggiefiles = 0L; … … 2306 2293 if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) { 2307 2294 res = 2308 read_EXAT_files_from_tape( bkpinfo,&biggie_size, biggie_fname,2295 read_EXAT_files_from_tape(&biggie_size, biggie_fname, 2309 2296 &ctrl_chr, xattr_fname, acl_fname); 2310 2297 } … … 2342 2329 mr_free(tmp); 2343 2330 2344 res = restore_a_biggiefile_from_stream(b kpinfo, biggie_fname,2331 res = restore_a_biggiefile_from_stream(biggie_fname, 2345 2332 current_bigfile_number, 2346 2333 biggie_cksum, … … 2428 2415 */ 2429 2416 int 2430 restore_all_tarballs_from_stream(struct s_bkpinfo *bkpinfo, 2431 struct s_node *filelist) 2417 restore_all_tarballs_from_stream(struct s_node *filelist) 2432 2418 { 2433 2419 int retval = 0; … … 2493 2479 iamhere("Reading EXAT files from tape"); 2494 2480 res = 2495 read_EXAT_files_from_tape( bkpinfo,&tmp_size, tmp_fname,2481 read_EXAT_files_from_tape(&tmp_size, tmp_fname, 2496 2482 &ctrl_chr, xattr_fname, 2497 2483 acl_fname); … … 2506 2492 */ 2507 2493 res = 2508 restore_a_tarball_from_stream( bkpinfo,tmp_fname,2494 restore_a_tarball_from_stream(tmp_fname, 2509 2495 current_afioball_number, 2510 2496 filelist, tmp_size, xattr_fname, … … 2568 2554 * @ingroup restoreGroup 2569 2555 */ 2570 int restore_everything(struct s_ bkpinfo *bkpinfo, struct s_node *filelist)2556 int restore_everything(struct s_node *filelist) 2571 2557 { 2572 2558 int resA; … … 2602 2588 mvaddstr_and_log_it(g_currentY, 0, _("Preparing to read your archives")); 2603 2589 if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) { 2604 mount_cdrom( bkpinfo);2590 mount_cdrom(); 2605 2591 mvaddstr_and_log_it(g_currentY++, 0, 2606 2592 _("Restoring OS and data from streaming media")); 2607 2593 if (bkpinfo->backup_media_type == cdstream) { 2608 openin_cdstream( bkpinfo);2594 openin_cdstream(); 2609 2595 } else { 2610 assert_string_is_neither_NULL_nor_zerolength(bkpinfo-> 2611 media_device); 2612 openin_tape(bkpinfo); 2613 } 2614 resA = restore_all_tarballs_from_stream(bkpinfo, filelist); 2615 resB = restore_all_biggiefiles_from_stream(bkpinfo, filelist); 2596 assert_string_is_neither_NULL_nor_zerolength(bkpinfo->media_device); 2597 openin_tape(); 2598 } 2599 resA = restore_all_tarballs_from_stream(filelist); 2600 resB = restore_all_biggiefiles_from_stream(filelist); 2616 2601 if (bkpinfo->backup_media_type == cdstream) { 2617 closein_cdstream( bkpinfo);2602 closein_cdstream(); 2618 2603 } else { 2619 closein_tape( bkpinfo);2604 closein_tape(); 2620 2605 } 2621 2606 } else { 2622 2607 mvaddstr_and_log_it(g_currentY++, 0, 2623 2608 _("Restoring OS and data from CD ")); 2624 mount_cdrom( bkpinfo);2625 resA = restore_all_tarballs_from_CD( bkpinfo,filelist);2626 resB = restore_all_biggiefiles_from_CD( bkpinfo,filelist);2609 mount_cdrom(); 2610 resA = restore_all_tarballs_from_CD(filelist); 2611 resB = restore_all_biggiefiles_from_CD(filelist); 2627 2612 } 2628 2613 chdir(cwd); … … 2651 2636 */ 2652 2637 int 2653 restore_live_from_monitas_server(struct s_bkpinfo *bkpinfo, 2654 char *monitas_device, 2638 restore_live_from_monitas_server(char *monitas_device, 2655 2639 char *restore_this_directory, 2656 2640 char *restore_here) … … 2724 2708 2725 2709 unlink(datadisks_fname); 2726 read_cfg_file_into_bkpinfo(g_mondo_cfg_file , bkpinfo);2710 read_cfg_file_into_bkpinfo(g_mondo_cfg_file); 2727 2711 retval = load_mountlist(&the_mountlist, g_mountlist_fname); // in case read_cfg_file_into_bkpinfo strcpy(bkpinfo->media_device, monitas_device); 2728 2712 … … 2751 2735 run_program_and_log_output(command, FALSE); 2752 2736 // filelist = load_filelist(g_filelist_restthese); // FIXME --- this probably doesn't work because it doesn't include the biggiefiles 2753 retval += restore_everything( bkpinfo,filelist);2737 retval += restore_everything(filelist); 2754 2738 free_filelist(filelist); 2755 2739 mr_msg(2, "--------End of restore_live_from_monitas_server--------"); … … 2820 2804 struct mountlist_itself *mountlist = NULL; 2821 2805 struct raidlist_itself *raidlist = NULL; 2822 struct s_bkpinfo *bkpinfo = NULL;2823 2806 struct s_node *filelist = NULL; 2824 2807 char *a = NULL, *b = NULL; … … 2840 2823 mr_conf = mr_malloc(sizeof(struct mr_rs_conf)); 2841 2824 mr_rs_reset_conf(mr_conf); 2825 bkpinfo = mr_malloc(sizeof(struct s_bkpinfo)); 2826 reset_bkpinfo(); 2842 2827 2843 2828 mr_conf->log_level = DEFAULT_MR_LOGLEVEL; … … 2859 2844 g_text_mode = FALSE; 2860 2845 } // newt :-) 2861 bkpinfo = mr_malloc(sizeof(struct s_bkpinfo));2862 2846 mountlist = mr_malloc(sizeof(struct mountlist_itself)); 2863 2847 raidlist = mr_malloc(sizeof(struct raidlist_itself)); … … 2873 2857 malloc_string(a); 2874 2858 malloc_string(b); 2875 setup_MR_global_filenames(bkpinfo); // malloc() and set globals, using bkpinfo->tmpdir etc. 2876 reset_bkpinfo(bkpinfo); 2859 setup_MR_global_filenames(); // malloc() and set globals, using bkpinfo->tmpdir etc. 2877 2860 bkpinfo->backup_media_type = none; // in case boot disk was made for one backup type but user wants to restore from another backup type 2878 2861 strcpy(bkpinfo->backup_media_string,""); … … 2909 2892 2910 2893 /* Init directories */ 2911 make_hole_for_dir(bkpinfo->tmpdir);2912 mr_asprintf(&tmp, "mkdir -p %s", bkpinfo->tmpdir);2913 run_program_and_log_output(tmp, FALSE);2914 mr_free(tmp);2915 2916 2894 make_hole_for_dir("/var/log"); 2917 2895 make_hole_for_dir("/tmp/tmpfs"); /* just in case... */ … … 2943 2921 strcpy(g_mountlist_fname, "/tmp/mountlist.txt"); 2944 2922 } 2945 res = let_user_edit_the_mountlist( bkpinfo,mountlist, raidlist);2923 res = let_user_edit_the_mountlist(mountlist, raidlist); 2946 2924 #ifdef __FreeBSD__ 2947 2925 system("mv -f /etc/raidtab /tmp/raidconf.txt"); … … 2977 2955 2978 2956 malloc_string(tmp); 2979 restore_a_biggiefile_from_CD( bkpinfo,42, NULL, tmp);2957 restore_a_biggiefile_from_CD(42, NULL, tmp); 2980 2958 mr_free(tmp); 2981 2959 } … … 3077 3055 if (argc == 5 && strcmp(argv[1], "--monitas-live") == 0) { 3078 3056 retval = 3079 restore_live_from_monitas_server(bkpinfo, 3080 argv[2], 3057 restore_live_from_monitas_server(argv[2], 3081 3058 argv[3], argv[4]); 3082 3059 } else { 3083 3060 mr_msg(2, "Calling restore_to_live_filesystem()"); 3084 retval = restore_to_live_filesystem( bkpinfo);3061 retval = restore_to_live_filesystem(); 3085 3062 } 3086 3063 mr_msg(2, "Still here. Yay."); … … 3103 3080 iamhere("About to call load_mountlist and load_raidtab"); 3104 3081 strcpy(bkpinfo->restore_path, MNT_RESTORING); 3105 read_cfg_file_into_bkpinfo(g_mondo_cfg_file , bkpinfo);3082 read_cfg_file_into_bkpinfo(g_mondo_cfg_file); 3106 3083 retval = load_mountlist(mountlist, g_mountlist_fname); 3107 3084 retval += load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME); … … 3163 3140 if (argc == 2 && strcmp(argv[1], "--nuke") == 0) { 3164 3141 iamhere("nuking"); 3165 retval += nuke_mode( bkpinfo,mountlist, raidlist);3142 retval += nuke_mode(mountlist, raidlist); 3166 3143 } else if (argc == 2 && strcmp(argv[1], "--interactive") == 0) { 3167 3144 iamhere("catchall"); 3168 retval += catchall_mode( bkpinfo,mountlist, raidlist);3145 retval += catchall_mode(mountlist, raidlist); 3169 3146 } else if (argc == 2 && strcmp(argv[1], "--compare") == 0) { 3170 3147 iamhere("compare"); 3171 retval += compare_mode( bkpinfo,mountlist, raidlist);3148 retval += compare_mode(mountlist, raidlist); 3172 3149 } else if (argc == 2 && strcmp(argv[1], "--iso") == 0) { 3173 3150 iamhere("iso"); 3174 retval = iso_mode( bkpinfo,mountlist, raidlist, FALSE);3151 retval = iso_mode(mountlist, raidlist, FALSE); 3175 3152 } else if (argc == 2 && strcmp(argv[1], "--mbr") == 0) { 3176 3153 iamhere("mbr"); … … 3185 3162 } else if (argc == 2 && strcmp(argv[1], "--isonuke") == 0) { 3186 3163 iamhere("isonuke"); 3187 retval = iso_mode( bkpinfo,mountlist, raidlist, TRUE);3164 retval = iso_mode(mountlist, raidlist, TRUE); 3188 3165 } else if (argc != 1) { 3189 3166 log_to_screen(_("Invalid parameters")); … … 3191 3168 } else { 3192 3169 iamhere("catchall (no mode specified in command-line call"); 3193 retval += catchall_mode( bkpinfo,mountlist, raidlist);3170 retval += catchall_mode(mountlist, raidlist); 3194 3171 } 3195 3172 } … … 3197 3174 /* clean up at the end */ 3198 3175 if (retval) { 3199 if (does_file_exist( "/tmp/changed.files")) {3176 if (does_file_exist(MINDI_CACHE"/changed.files")) { 3200 3177 log_to_screen 3201 (_("See /tmp/changed.files for list of files that have changed."));3178 (_("See "MINDI_CACHE"/changed.files for list of files that have changed.")); 3202 3179 } 3203 3180 mvaddstr_and_log_it(g_currentY++,
Note:
See TracChangeset
for help on using the changeset viewer.