Changeset 2324 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c
- Timestamp:
- Aug 18, 2009, 3:13:54 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c
r2323 r2324 272 272 if (!bkpinfo->isodir[0]) { 273 273 mr_free(bkpinfo->isodir); 274 mr_asprintf(p, "/tmp/isodir"); 275 bkpinfo->isodir = p; 274 mr_asprintf(bkpinfo->isodir, "/tmp/isodir"); 276 275 } 277 276 /* End patch */ … … 498 497 "Again with the /proc - why is this in your mountlist?"); 499 498 } else if (is_this_device_mounted(mountlist->el[lino].device)) { 500 mr_asprintf(tmp, "%s is already mounted", mountlist->el[lino].device); 501 log_to_screen(tmp); 502 mr_free(tmp); 499 log_to_screen("%s is already mounted", mountlist->el[lino].device); 503 500 } else if (strcmp(mountlist->el[lino].mountpoint, "none") 504 501 && strcmp(mountlist->el[lino].mountpoint, "lvm") … … 595 592 if (!strcmp(bkpinfo->isodir, "/") && am_I_in_disaster_recovery_mode()) { 596 593 mr_free(bkpinfo->isodir); 597 mr_asprintf(p, "/tmp/isodir"); 598 bkpinfo->isodir = p; 594 mr_asprintf(bkpinfo->isodir, "/tmp/isodir"); 599 595 log_msg(1, "isodir is being set to %s", bkpinfo->isodir); 600 596 } … … 772 768 mr_free(bkpinfo->prefix); 773 769 if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) { 774 mr_asprintf(tmp1, "%s", value); 775 } else { 776 mr_asprintf(tmp1, "%s", STD_PREFIX); 777 } 778 bkpinfo->prefix = tmp1; 770 mr_asprintf(bkpinfo->prefix, "%s", value); 771 } else { 772 mr_asprintf(bkpinfo->prefix, "%s", STD_PREFIX); 773 } 779 774 } else if (!strcmp(value, "nfs")) { 780 775 bkpinfo->backup_media_type = nfs; … … 782 777 mr_free(bkpinfo->prefix); 783 778 if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) { 784 mr_asprintf(tmp1, "%s", value); 785 } else { 786 mr_asprintf(tmp1, "%s", STD_PREFIX); 787 } 788 bkpinfo->prefix = tmp1; 779 mr_asprintf(bkpinfo->prefix, "%s", value); 780 } else { 781 mr_asprintf(bkpinfo->prefix, "%s", STD_PREFIX); 782 } 789 783 790 784 if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "pxe")) { … … 796 790 } 797 791 mr_free(bkpinfo->prefix); 798 mr_asprintf(tmp1, "%s", envtmp1); 799 bkpinfo->prefix = tmp1; 792 mr_asprintf(bkpinfo->prefix, "%s", envtmp1); 800 793 } 801 794 … … 970 963 read_cfg_var(g_mondo_cfg_file, "isodir", iso_path); 971 964 mr_free(bkpinfo->isodir); 972 mr_asprintf(tmp1, "%s%s", iso_mnt, iso_path); 973 bkpinfo->isodir = tmp1; 965 mr_asprintf(bkpinfo->isodir, "%s%s", iso_mnt, iso_path); 974 966 if (!bkpinfo->isodir[0]) { 975 967 mr_free(bkpinfo->isodir); … … 2012 2004 } 2013 2005 mr_asprintf(tmp, "Unmounting device %s ", mountlist->el[lino].device); 2014 2015 2006 update_progress_form(tmp); 2016 2007 … … 2194 2185 } 2195 2186 mr_asprintf(tmp, "%s", bkpinfo->media_device); 2196 if (extract_cfg_file_and_mountlist_from_tape_dev 2197 (bkpinfo->media_device)) { 2187 if (extract_cfg_file_and_mountlist_from_tape_dev (bkpinfo->media_device)) { 2198 2188 strcpy(bkpinfo->media_device, "/dev/st0"); 2199 if (extract_cfg_file_and_mountlist_from_tape_dev 2200 (bkpinfo->media_device)) { 2189 if (extract_cfg_file_and_mountlist_from_tape_dev (bkpinfo->media_device)) { 2201 2190 strcpy(bkpinfo->media_device, "/dev/osst0"); 2202 if (extract_cfg_file_and_mountlist_from_tape_dev 2203 (bkpinfo->media_device)) { 2191 if (extract_cfg_file_and_mountlist_from_tape_dev (bkpinfo->media_device)) { 2204 2192 strcpy(bkpinfo->media_device, "/dev/ht0"); 2205 if (extract_cfg_file_and_mountlist_from_tape_dev 2206 (bkpinfo->media_device)) { 2207 log_msg(3, 2208 "I tried lots of devices but none worked."); 2193 if (extract_cfg_file_and_mountlist_from_tape_dev (bkpinfo->media_device)) { 2194 log_msg(3, "I tried lots of devices but none worked."); 2209 2195 strcpy(bkpinfo->media_device, tmp); 2210 2196 } … … 2343 2329 /* @} - end restoreUtilityGroup */ 2344 2330 2345 2346 /***************************************************************************2347 * F@ *2348 * () -- Hugo Rabson *2349 * *2350 * Purpose: *2351 * *2352 * Called by: *2353 * Params: - - *2354 * Returns: 0=success; nonzero=failure *2355 ***************************************************************************/2356 2357 2358 2359 2331 void wait_until_software_raids_are_prepped(char *mdstat_file, 2360 2332 int wait_for_percentage)
Note:
See TracChangeset
for help on using the changeset viewer.