Changeset 2937 in MondoRescue for branches/3.1/mondo/src/common/newt-specific.c
- Timestamp:
- Jan 28, 2012, 1:51:28 AM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.1/mondo/src/common/newt-specific.c
r2874 r2937 262 262 char *tmp1 = NULL; 263 263 264 mr_asprintf(tmp,"ps %s | grep \" %s \" | awk '{print %s;}' | grep -v \"grep\"", ps_options, str , ps_proc_id);264 mr_asprintf(tmp,"ps %s | grep \" %s \" | grep -v \"grep\" | awk '{print %s;}'", ps_options, str , ps_proc_id); 265 265 run_program_and_log_output(tmp, TRUE); 266 266 if (strlen(tmp) > 0) { … … 320 320 chdir("/"); 321 321 if (g_selfmounted_isodir) { 322 mr_asprintf(command, "umount %s", g_selfmounted_isodir);322 mr_asprintf(command, "umount -d %s", g_selfmounted_isodir); 323 323 run_program_and_log_output(command, 5); 324 324 mr_free(command); … … 368 368 char *command = NULL; 369 369 370 chdir("/"); 371 run_program_and_log_output("umount " MNT_CDROM, FALSE); 370 /* Before removing dir, make sure we're out of them */ 371 chdir("/tmp"); 372 run_program_and_log_output("umount -d " MNT_CDROM, FALSE); 372 373 if (g_selfmounted_isodir) { 373 mr_asprintf(command, "umount %s", g_selfmounted_isodir);374 mr_asprintf(command, "umount -d %s", g_selfmounted_isodir); 374 375 run_program_and_log_output(command, 1); 375 376 mr_free(command); … … 382 383 log_msg(8,"tempdir is %s",bkpinfo->tmpdir); 383 384 if (strstr(bkpinfo->tmpdir ,"mondo.tmp.") != NULL) { 384 log_msg(8,"erasing tempdir ");385 log_msg(8,"erasing tempdir %s",bkpinfo->tmpdir); 385 386 mr_asprintf(command, "rm -Rf %s", bkpinfo->tmpdir); 386 387 system(command); … … 391 392 log_msg(8,"scratchdir is %s", bkpinfo->scratchdir); 392 393 if (strstr(bkpinfo->scratchdir ,"mondo.scratch.") != NULL) { 393 log_msg(8,"erasing scratchdir ");394 log_msg(8,"erasing scratchdir %s",bkpinfo->scratchdir); 394 395 mr_asprintf(command, "rm -Rf %s", bkpinfo->scratchdir); 395 396 system(command); … … 579 580 newtCenteredWindow(40, 7, title); 580 581 g_isoform_main = newtForm(NULL, NULL, 0); 581 g_isoform_timeline = newtLabel(1, 5, " This is the timeline");582 g_isoform_pcline = newtLabel(1, 6, " This is the pcline");582 g_isoform_timeline = newtLabel(1, 5, " "); 583 g_isoform_pcline = newtLabel(1, 6, " "); 583 584 newtFormAddComponents(g_isoform_main, g_isoform_timeline, 584 585 g_isoform_pcline, g_isoform_header, 585 586 g_isoform_scale, NULL); 587 newtDrawForm(g_isoform_main); 586 588 newtRefresh(); 587 589 } … … 647 649 g_scale = newtScale(3, 6, 54, (long long)g_maximum_progress); 648 650 g_progressForm = newtForm(NULL, NULL, 0); 649 g_percentline = newtLabel(10, 9, " This is the percentline");650 g_timeline = newtLabel(10, 8, " This is the timeline");651 g_percentline = newtLabel(10, 9, " "); 652 g_timeline = newtLabel(10, 8, " "); 651 653 newtFormAddComponents(g_progressForm, g_percentline, g_timeline, g_scale, g_blurb1, g_blurb3, g_blurb2, NULL); 652 654 newtPushHelpLine(b1c); 655 newtDrawForm(g_progressForm); 653 656 newtRefresh(); 654 657 } … … 969 972 } 970 973 if (!g_text_mode) { 974 newtDrawForm(g_isoform_main); 971 975 newtRefresh(); 972 976 } … … 1100 1104 mr_free(percentline_str); 1101 1105 1106 newtDrawForm(g_progressForm); 1102 1107 newtRefresh(); 1103 1108 }
Note:
See TracChangeset
for help on using the changeset viewer.