Changeset 3271 in MondoRescue for branches/3.2/mondo
- Timestamp:
- Apr 29, 2014, 9:23:09 PM (10 years ago)
- Location:
- branches/3.2/mondo/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.2/mondo/src/common/libmondo-devices.c
r3263 r3271 2327 2327 paranoid_fclose(fin); 2328 2328 } else { 2329 if (does_file_exist("/tmp/mondo -restore.cfg")) {2330 read_cfg_var("/tmp/mondo -restore.cfg", "media-dev", bkpinfo->media_device);2329 if (does_file_exist("/tmp/mondorestore.cfg")) { 2330 read_cfg_var("/tmp/mondorestore.cfg", "media-dev", bkpinfo->media_device); 2331 2331 } 2332 2332 } -
branches/3.2/mondo/src/common/libmondo-filelist.c
r3238 r3271 698 698 699 699 strcpy(val_sz,""); 700 mr_asprintf(cfg_fname, "%s/mondo -restore.cfg", bkpinfo->tmpdir);700 mr_asprintf(cfg_fname, "%s/mondorestore.cfg", bkpinfo->tmpdir); 701 701 read_cfg_var(cfg_fname, "last-filelist-number", val_sz); 702 702 mr_free(cfg_fname); -
branches/3.2/mondo/src/common/libmondo-stream.c
r3194 r3271 871 871 // FIXME 872 872 } 873 mr_asprintf(tmp, "tar -zxf %s ./tmp/mondo -restore.cfg 2> /dev/null", outfname);873 mr_asprintf(tmp, "tar -zxf %s ./tmp/mondorestore.cfg 2> /dev/null", outfname); 874 874 paranoid_system(tmp); 875 875 mr_free(tmp); 876 876 877 paranoid_system("cp -f tmp/mondo -restore.cfg . 2> /dev/null");877 paranoid_system("cp -f tmp/mondorestore.cfg . 2> /dev/null"); 878 878 if (chdir(old_cwd)) { 879 879 // FIXME -
branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.c
r3263 r3271 29 29 30 30 /** 31 * The mondo -restore.cfg stub (appended to the directory where all.tar.gz was unpacked).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 "tmp/mondorestore.cfg" 34 34 /** 35 35 * The i-want-my-lvm stub … … 170 170 171 171 /** 172 * Extract @c mondo -restore.cfg and @c mountlist.txt from @p ramdisk_fname.172 * Extract @c mondorestore.cfg and @c mountlist.txt from @p ramdisk_fname. 173 173 * @param bkpinfo The backup information structure. @c tmpdir is the only field used. 174 174 * @param ramdisk_fname The filename of the @b compressed ramdisk to look in. … … 180 180 181 181 /** 182 * Keep trying to get mondo -restore.cfg from the archive, until the user gives up.182 * Keep trying to get mondorestore.cfg from the archive, until the user gives up. 183 183 */ 184 184 void get_cfg_file_from_archive_or_bust() … … 628 628 /** 629 629 * Fill out @p bkpinfo based on @p cfg_file. 630 * @param cfg_file The mondo -restore.cfg file to read into @p bkpinfo.630 * @param cfg_file The mondorestore.cfg file to read into @p bkpinfo. 631 631 * @param bkpinfo The backup information structure to fill out with information 632 632 * from @p cfg_file. … … 2022 2022 2023 2023 /** 2024 * Extract mondo -restore.cfg and the mountlist from the tape inserted2024 * Extract mondorestore.cfg and the mountlist from the tape inserted 2025 2025 * to the ./tmp/ directory. 2026 2026 * @param dev The tape device to read from. … … 2157 2157 mr_free(tmp); 2158 2158 2159 if (!does_file_exist("tmp/mondo -restore.cfg")) {2159 if (!does_file_exist("tmp/mondorestore.cfg")) { 2160 2160 log_to_screen("Cannot find config info on media"); 2161 2161 return (1); … … 2236 2236 } 2237 2237 2238 log_to_screen("Recovered mondo -restore.cfg");2238 log_to_screen("Recovered mondorestore.cfg"); 2239 2239 if (!does_file_exist(MOUNTLIST_FNAME_STUB)) { 2240 2240 log_to_screen("...but not mountlist.txt - a pity, really...");
Note:
See TracChangeset
for help on using the changeset viewer.