Changeset 3263 in MondoRescue for branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.c
- Timestamp:
- Apr 22, 2014, 11:06:38 AM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.c
r3211 r3263 185 185 { 186 186 while (get_cfg_file_from_archive()) { 187 if (!ask_me_yes_or_no 188 ("Failed to find config file/archives. Choose another source?")) 189 { 190 fatal_error("Could not find config file/archives. Aborting."); 191 } 192 interactively_obtain_media_parameters_from_user(FALSE); 193 } 187 if (!ask_me_yes_or_no("Failed to find config file/archives. Choose another source?")) { 188 fatal_error("Could not find config file/archives. Aborting."); 189 } 190 interactively_obtain_media_parameters_from_user(FALSE); 191 } 194 192 } 195 193 … … 2118 2116 log_msg(2, "gcffa --- calling mount_media now :)"); 2119 2117 if (!mount_media()) { 2120 log_msg(2, 2121 "gcffa --- managed to mount CD; so, no need for Plan B"); 2118 log_msg(2, "gcffa --- managed to mount CD; so, no need for Plan B"); 2122 2119 try_plan_B = FALSE; 2123 2120 } else { … … 2176 2173 } 2177 2174 2178 log_msg(2, 2179 "gcffa --- Plan B, a.k.a. untarring some file from all.tar.gz"); 2175 log_msg(2, "gcffa --- Plan B, a.k.a. untarring some file from all.tar.gz"); 2180 2176 mr_asprintf(command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz ./%s ./%s ./%s ./%s ./%s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB); // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary 2181 2177 run_program_and_log_output(command, TRUE); … … 2200 2196 mr_asprintf(command, "cp -f %s %s", tmp, cfg_file); 2201 2197 log_it("%s",command); 2202 if (strcmp(tmp, cfg_file) 2203 && run_program_and_log_output(command, 1)) { 2198 if (strcmp(tmp, cfg_file) && run_program_and_log_output(command, 1)) { 2204 2199 log_msg(1, 2205 2200 "... but an error occurred when I tried to move it to %s", … … 2213 2208 log_it("%s",command); 2214 2209 if (extract_mountlist_stub) { 2215 if (strcmp(tmp, cfg_file) 2216 && run_program_and_log_output(command, 1)) { 2210 if (strcmp(tmp, cfg_file) && run_program_and_log_output(command, 1)) { 2217 2211 log_msg(1, "Failed to get mountlist"); 2218 2212 } else { … … 2238 2232 log_it("%s",cfg_file); 2239 2233 log_msg(1, "%s not found", cfg_file); 2240 log_to_screen 2241 ("Oh dear. Unable to recover configuration file from boot disk"); 2234 log_to_screen("Oh dear. Unable to recover configuration file from boot disk"); 2242 2235 return (1); 2243 2236 } … … 2246 2239 if (!does_file_exist(MOUNTLIST_FNAME_STUB)) { 2247 2240 log_to_screen("...but not mountlist.txt - a pity, really..."); 2248 } 2249 else { 2241 } else { 2250 2242 /* Is this code really useful ??? */ 2251 2243 if (extract_mountlist_stub) {
Note:
See TracChangeset
for help on using the changeset viewer.