Changeset 2462 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c
- Timestamp:
- Oct 20, 2009, 4:07:00 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c
r2451 r2462 26 26 * The mountlist stub (appended to the directory where all.tar.gz was unpacked). 27 27 */ 28 #define MOUNTLIST_FNAME_STUB "tmp/mountlist.txt"29 30 /** 31 * The mondo -restore.cfg stub (appended to the directory where all.tar.gz was unpacked).28 #define MOUNTLIST_FNAME_STUB MINDI_CACHE_REL"/mountlist.txt" 29 30 /** 31 * The mondorestore.cfg stub (appended to the directory where all.tar.gz was unpacked). 32 32 */ 33 #define MONDO_CFG_FILE_STUB "tmp/mondo-restore.cfg"33 #define MONDO_CFG_FILE_STUB MINDI_CACHE_REL"/mondorestore.cfg" 34 34 /** 35 35 * The i-want-my-lvm stub … … 157 157 158 158 /** 159 * Extract @c mondo -restore.cfg and @c mountlist.txt from @p ramdisk_fname.159 * Extract @c mondorestore.cfg and @c mountlist.txt from @p ramdisk_fname. 160 160 * @param bkpinfo The backup information structure. @c tmpdir is the only field used. 161 161 * @param ramdisk_fname The filename of the @b compressed ramdisk to look in. … … 167 167 168 168 /** 169 * Keep trying to get mondo -restore.cfg from the archive, until the user gives up.169 * Keep trying to get mondorestore.cfg from the archive, until the user gives up. 170 170 */ 171 171 void get_cfg_file_from_archive_or_bust() … … 678 678 /** 679 679 * Fill out @p bkpinfo based on @p cfg_file. 680 * @param cfg_file The mondo -restore.cfg file to read into @p bkpinfo.680 * @param cfg_file The mondorestore.cfg file to read into @p bkpinfo. 681 681 * @param bkpinfo The backup information structure to fill out with information 682 682 * from @p cfg_file. … … 1574 1574 if (!run_program_and_log_output("which grub-MR", FALSE)) { 1575 1575 log_msg(1, "Yay! grub-MR found..."); 1576 mr_asprintf(command, "grub-MR %s /tmp/mountlist.txt", boot_device);1576 mr_asprintf(command, "grub-MR %s "MINDI_CACHE"/mountlist.txt", boot_device); 1577 1577 log_msg(1, "command = %s", command); 1578 1578 } else { … … 1872 1872 } else { 1873 1873 /* nuke mode */ 1874 mr_asprintf(command, "raw-MR %s /tmp/mountlist.txt", boot_device);1874 mr_asprintf(command, "raw-MR %s "MINDI_CACHE"/mountlist.txt", boot_device); 1875 1875 log_msg(2, "run_raw_mbr() --- command='%s'", command); 1876 1876 … … 2128 2128 2129 2129 /** 2130 * Extract mondo -restore.cfg and the mountlist from the tape inserted2130 * Extract mondorestore.cfg and the mountlist from the tape inserted 2131 2131 * to the ./tmp/ directory. 2132 2132 * @param dev The tape device to read from. … … 2261 2261 mr_free(tmp); 2262 2262 2263 if (!does_file_exist( "tmp/mondo-restore.cfg")) {2263 if (!does_file_exist(MINDI_CACHE_REL"/mondorestore.cfg")) { 2264 2264 log_to_screen("Cannot find config info on media"); 2265 2265 return (1); … … 2345 2345 } 2346 2346 2347 log_to_screen("Recovered mondo -restore.cfg");2347 log_to_screen("Recovered mondorestore.cfg"); 2348 2348 if (!does_file_exist(MOUNTLIST_FNAME_STUB)) { 2349 2349 log_to_screen("...but not mountlist.txt - a pity, really...");
Note:
See TracChangeset
for help on using the changeset viewer.