Changeset 1437 in MondoRescue
- Timestamp:
- May 10, 2007, 11:41:11 PM (18 years ago)
- Location:
- branches/2.2.4/mondo/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.4/mondo/src/common/libmondo-archive.c
r1402 r1437 1047 1047 if (!res) { 1048 1048 log_to_screen("Boot+data disks were created OK"); 1049 sprintf(command, "mkdir -p /var/cache/mindi/"); 1050 log_msg(2, command); 1051 run_program_and_log_output(command, FALSE); 1052 sprintf(command, 1053 "cp -f %s/images/mindi.iso /var/cache/mindi/mondorescue.iso", 1054 bkpinfo->scratchdir); 1049 sprintf(command, "cp -f %s/images/mindi.iso %s/mondorescue.iso", 1050 bkpinfo->scratchdir, MINDI_CACHE); 1055 1051 log_msg(2, command); 1056 1052 run_program_and_log_output(command, FALSE); … … 2274 2270 ftmp = fopen(bigfile_fname, "w"); 2275 2271 if (ftmp == NULL) { 2276 log_msg( "Unable to write to %s", bigfile_fname);2272 log_msg(3, "Unable to write to %s", bigfile_fname); 2277 2273 // So skip it as it doesn't exist 2278 2274 continue; … … 2779 2775 * @c backup_media_type field is used in this function. 2780 2776 * @param imagesdir The directory containing the floppy images (usually 2781 * / var/cache/mindi).2777 * /root/images/mindi). 2782 2778 * 2783 2779 * @return The number of errors encountered (0 for success) … … 2958 2954 if (!bkpinfo->nonbootable_backup) { 2959 2955 #ifdef __FreeBSD__ 2960 if (!does_file_exist( "/var/cache/mindi/mindi-kern.1722.img"))2956 if (!does_file_exist(MINDI_CACHE"/mindi-kern.1722.img")) 2961 2957 #else 2962 if (!does_file_exist("/var/cache/mindi/mindi-bootroot.1722.img") 2963 && !does_file_exist("/var/cache/mindi/mindi-boot.1440.img")) 2958 if (!does_file_exist(MINDI_CACHE"/mindi-bootroot.1722.img") && !does_file_exist(MINDI_CACHE"/mindi-boot.1440.img")) 2964 2959 #endif 2965 2960 { 2966 2961 mvaddstr_and_log_it(g_currentY++, 74, "No Imgs"); 2967 if (does_file_exist( "/var/cache/mindi/mondorescue.iso")) {2968 popup_and_OK2969 (" Boot+data floppy creation failed. However, FYI, you may burn /var/cache/mindi/mondorescue.iso to a CD and boot from that instead if you wish.");2962 if (does_file_exist(MINDI_CACHE"/mondorescue.iso")) { 2963 popup_and_OK 2964 ("No regular Boot+data floppies were created due of space constraints. However, you can burn "MINDI_CACHE"/mondorescue.iso to a CD and boot from that."); 2970 2965 res++; 2971 2966 } 2972 2967 } else { 2973 offer_to_write_floppies(bkpinfo, "/var/cache/mindi");2968 offer_to_write_floppies(bkpinfo, MINDI_CACHE); 2974 2969 mvaddstr_and_log_it(g_currentY++, 74, "Done."); 2975 2970 } -
branches/2.2.4/mondo/src/common/libmondo-filelist.c
r1316 r1437 1750 1750 sprintf(exclude_paths, " %s %s %s %s %s %s . .. \ 1751 1751 " MNT_CDROM " " MNT_FLOPPY " /media \ 1752 /proc /sys /root/images/mondo /root/images/mindi", excp, call_program_and_get_last_line_of_output("locate /win386.swp 2> /dev/null"), call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null"), call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null"), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);1752 /proc /sys /root/images/mondo MINDI_CACHE ", excp, call_program_and_get_last_line_of_output("locate /win386.swp 2> /dev/null"), call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null"), call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null"), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir); 1753 1753 1754 1754 log_msg(2, "Excluding paths = '%s'", exclude_paths); -
branches/2.2.4/mondo/src/common/libmondo-tools.c
r1381 r1437 1100 1100 #endif 1101 1101 1102 if ((Lres = free_space_on_given_partition("/root")) == -1) { 1103 Lres = free_space_on_given_partition("/"); 1104 } 1105 log_it("Free space on given partition = %ld MB", Lres); 1102 Lres = free_space_on_given_partition(MINDI_CACHE); 1103 log_it("Free space on partition of %s = %ld MB", MINDI_CACHE, Lres); 1106 1104 1107 1105 if (Lres < 50) { 1108 run_program_and_log_output 1109 ("rm -Rf /root/images/mindi; mkdir -p /home/root/images/mindi; mkdir -p /root/images; ln -sf /home/root/images/mindi /root/images/mindi", 1110 3); 1111 // fatal_error("Your / (or /root) partition has <50MB free. Please adjust your partition table to something saner."); 1106 sprintf(tmp, "The partition of %s has <50MB free. Please free up space or enlarge the partition or make %s a symbolic link.", MINDI_CACHE, MINDI_CACHE); 1107 fatal_error(tmp); 1112 1108 } 1113 1109 -
branches/2.2.4/mondo/src/common/my-stuff.h
r1315 r1437 231 231 */ 232 232 #define MONDO_CFG_FILE_STUB "tmp/mondo-restore.cfg" 233 /** 234 * The location where mindi CD and floppy images are stored. 235 */ 236 #define MINDI_CACHE "/var/cache/mindi" 233 237 234 238 /** -
branches/2.2.4/mondo/src/mondoarchive/main.c
r1383 r1437 501 501 } 502 502 503 if (does_file_exist( "/root/images/mindi/mondorescue.iso")) {503 if (does_file_exist(MINDI_CACHE"/mondorescue.iso")) { 504 504 log_to_screen 505 ( "/root/images/mindi/mondorescue.iso, a boot/utility CD, is available if you want it.");505 (MINDI_CACHE"/mondorescue.iso, a boot/utility CD, is available if you want it."); 506 506 } 507 507
Note:
See TracChangeset
for help on using the changeset viewer.