Changeset 2331 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-cli.c
- Timestamp:
- Aug 18, 2009, 3:25:29 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.10/mondo/src/common/libmondo-cli.c
r2330 r2331 709 709 } 710 710 711 if (!find_home_of_exe("afio")) { 712 if (find_home_of_exe("star")) { 711 tmp1 = find_home_of_exe("afio"); 712 if (!tmp1) { 713 mr_free(tmp1); 714 tmp1 = find_home_of_exe("star"); 715 if (tmp1) { 716 mr_free(tmp1); 713 717 flag_set['R'] = TRUE; 714 718 log_msg(1, "Using star instead of afio"); 715 719 } else { 716 fatal_error 717 ("Neither afio nor star is installed. Please install at least one."); 718 } 719 } 720 mr_free(tmp1); 721 fatal_error("Neither afio nor star is installed. Please install at least one."); 722 } 723 } 724 mr_free(tmp1); 720 725 721 726 if (flag_set['R']) { … … 724 729 fatal_error("You may not use star and lzop at the same time."); 725 730 } 726 if (!find_home_of_exe("star")) { 727 fatal_error 728 ("Please install 'star' RPM or tarball if you are going to use -R. Thanks."); 729 } 731 tmp1 = find_home_of_exe("star"); 732 if (!tmp1) { 733 mr_free(tmp1); 734 fatal_error("Please install 'star' RPM or tarball if you are going to use -R. Thanks."); 735 } 736 mr_free(tmp1); 730 737 } 731 738 … … 919 926 } 920 927 if (! bkpinfo->restore_data) { 921 if (!find_home_of_exe("growisofs")) { 928 tmp1 = find_home_of_exe("growisofs"); 929 if (!tmp1) { 930 mr_free(tmp1); 922 931 fatal_error("Please install growisofs (probably part of dvd+rw-tools). If you want DVD support, you need it."); 923 932 } 924 if (!find_home_of_exe("dvd+rw-format")) { 933 mr_free(tmp1); 934 935 tmp1 = find_home_of_exe("dvd+rw-format"); 936 if (!tmp1) { 937 mr_free(tmp1); 925 938 fatal_error("Please install dvd+rw-format (probably part of dvd+rw-tools). If you want DVD support, you need it."); 926 939 } 940 mr_free(tmp1); 941 927 942 if (!flag_set['s']) { 928 943 sprintf(flag_val['s'], "%d", DEFAULT_DVD_DISK_SIZE); // 4.7 salesman's GB = 4.482 real GB = 4582 MB … … 1046 1061 } 1047 1062 if (flag_set['z']) { 1048 if (find_home_of_exe("getfattr")) { 1063 tmp1 = find_home_of_exe("getfattr"); 1064 if (tmp1) { 1049 1065 mr_asprintf(g_getfattr,"getfattr"); 1050 1066 } 1051 if (find_home_of_exe("getfacl")) { 1067 mr_free(tmp1); 1068 1069 tmp1 = find_home_of_exe("getfacl"); 1070 if (tmp1) { 1052 1071 mr_asprintf(g_getfacl,"getfacl"); 1053 1072 } 1073 mr_free(tmp1); 1054 1074 } 1055 1075 … … 1332 1352 1333 1353 if (flag_set['Q']) { 1334 i = which_boot_loader(tmp1); 1335 log_msg(3, "boot loader is %c, residing at %s", i, tmp1); 1336 printf("boot loader is %c, residing at %s\n", i, tmp1); 1337 mr_free(tmp1); 1354 i = which_boot_loader(NULL); 1355 log_msg(3, "boot loader is %c", i); 1356 printf("boot loader is %c\n", i); 1338 1357 finish(0); 1339 1358 }
Note:
See TracChangeset
for help on using the changeset viewer.