Changeset 729 in MondoRescue for trunk/mondo/mondo/mondorestore
- Timestamp:
- Jul 30, 2006, 4:06:39 PM (18 years ago)
- Location:
- trunk/mondo/mondo/mondorestore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/mondo/mondo/mondorestore/mondo-prep.c
r689 r729 234 234 asprintf(&command, 235 235 "for i in `%s | grep -i lvm | cut -d'\"' -f2` ; do %s -a n $i ; %s $i; echo \"Shutting down vg $i\" >> " 236 MONDO_LOGFILE "; done ; %s -a n", vgscan_sz, vgchange_sz, vgremove_sz, vgremove_sz);236 MONDO_LOGFILE "; done", vgscan_sz, vgchange_sz, vgremove_sz); 237 237 paranoid_free(vgchange_sz); 238 238 paranoid_free(vgremove_sz); -
trunk/mondo/mondo/mondorestore/mondo-rstr-newt.c
r688 r729 1352 1352 paranoid_free(format_str); 1353 1353 1354 if (str str(mountlist->el[currline].device, RAID_DEVICE_STUB)1355 || !strcmp(mountlist->el[currline].mountpoint, "image")) {1356 mountlist->el[currline].size =1357 calculate_raid_device_size(mountlist, raidlist,1354 if (strcmp(mountlist->el[currline].mountpoint, "image")) { 1355 if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)) { 1356 mountlist->el[currline].size = 1357 calculate_raid_device_size(mountlist, raidlist, 1358 1358 mountlist->el[currline].device); 1359 } else { 1360 mountlist->el[currline].size = atol(size_str) * 1024; 1359 } else { 1360 mountlist->el[currline].size = atol(size_str) * 1024; 1361 } 1361 1362 } 1362 1363 paranoid_free(size_str); -
trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c
r689 r729 320 320 asprintf(&mount_isodir_command, "mount %s -o ro %s", g_isodir_device, bkpinfo->isodir); 321 321 } 322 run_program_and_log_output("df - P -m", FALSE);322 run_program_and_log_output("df -m", FALSE); 323 323 asprintf(&tmp, 324 324 "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?", … … 445 445 } 446 446 close_progress_form(); 447 run_program_and_log_output("df - P -m", TRUE);447 run_program_and_log_output("df -m", TRUE); 448 448 if (retval) { 449 449 if (g_partition_table_locked_up > 0) { … … 476 476 mvaddstr_and_log_it(g_currentY++, 74, _("Done.")); 477 477 } 478 run_program_and_log_output("df - P -m", 3);478 run_program_and_log_output("df -m", 3); 479 479 paranoid_free(mountlist); 480 480 return (retval); … … 766 766 FALSE); 767 767 run_program_and_log_output("cd " MNT_RESTORING 768 "; for i in `ls home/`; do echo \"Moving $i's spurious files to $i/.disabled\"; mkdir $i/.disabled ; mv -f $i/.DCOP* $i/.MCOP* $i/.*authority $i/.kde/tmp* $i/.kde/socket* $i/.disabled/ ; done",768 "; for i in `ls home/`; do echo \"Moving $i's spurious files to $i/.disabled\"; mkdir \"$i\"/.disabled ; mv -f \"$i\"/.DCOP* \"$i\"/.MCOP* \"$i\"/.*authority \"$i\"/.kde/tmp* \"$i\"/.kde/socket* \"$i\"/.disabled/ ; done", 769 769 TRUE); 770 770 run_program_and_log_output("rm -f " MNT_RESTORING "/var/run/*.pid", … … 1971 1971 sort_mountlist_by_mountpoint(mountlist, 0); 1972 1972 1973 run_program_and_log_output("df - P -m", 3);1973 run_program_and_log_output("df -m", 3); 1974 1974 mvaddstr_and_log_it(g_currentY, 0, _("Unmounting devices ")); 1975 1975 open_progress_form(_("Unmounting devices"), … … 2400 2400 paranoid_free(screen_message); 2401 2401 2402 if (raidlist->el[i].progress == -1) // delayed while another partition inits 2403 { 2402 if (raidlist->el[i].progress == -1) { // delayed while another partition inits 2404 2403 continue; 2405 2404 }
Note:
See TracChangeset
for help on using the changeset viewer.