Changeset 1108 in MondoRescue for branches/stable/mondo/src/mondoarchive
- Timestamp:
- Feb 8, 2007, 12:10:16 AM (17 years ago)
- Location:
- branches/stable/mondo/src/mondoarchive
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/stable/mondo/src/mondoarchive/main.c
r1102 r1108 61 61 void welcome_to_mondoarchive() 62 62 { 63 log_msg(0, "Mondo Archive v%s --- http://www.mondorescue.org",63 mr_msg(0, "Mondo Archive v%s --- http://www.mondorescue.org", 64 64 PACKAGE_VERSION); 65 log_msg(0, "running on %s architecture", get_architecture());66 log_msg(0,65 mr_msg(0, "running on %s architecture", get_architecture()); 66 mr_msg(0, 67 67 "-----------------------------------------------------------"); 68 log_msg(0,68 mr_msg(0, 69 69 "NB: Mondo logs almost everything, so don't panic if you see"); 70 log_msg(0,70 mr_msg(0, 71 71 "some error messages. Please read them carefully before you"); 72 log_msg(0,72 mr_msg(0, 73 73 "decide to break out in a cold sweat. Despite (or perhaps"); 74 log_msg(0,74 mr_msg(0, 75 75 "because of) the wealth of messages. some users are inclined"); 76 log_msg(0,76 mr_msg(0, 77 77 "to stop reading this log. If Mondo stopped for some reason,"); 78 log_msg(0,78 mr_msg(0, 79 79 "chances are it's detailed here. More than likely there's a"); 80 log_msg(0,80 mr_msg(0, 81 81 "message at the very end of this log that will tell you what"); 82 log_msg(0,82 mr_msg(0, 83 83 "is wrong. Please read it! -Devteam"); 84 log_msg(0,84 mr_msg(0, 85 85 "-----------------------------------------------------------"); 86 86 87 log_msg(0, "Zero...");88 log_msg(1, "One...");89 log_msg(2, "Two...");90 log_msg(3, "Three...");91 log_msg(4, "Four...");92 log_msg(5, "Five...");93 log_msg(6, "Six...");94 log_msg(7, "Seven...");95 log_msg(8, "Eight...");87 mr_msg(0, "Zero..."); 88 mr_msg(1, "One..."); 89 mr_msg(2, "Two..."); 90 mr_msg(3, "Three..."); 91 mr_msg(4, "Four..."); 92 mr_msg(5, "Five..."); 93 mr_msg(6, "Six..."); 94 mr_msg(7, "Seven..."); 95 mr_msg(8, "Eight..."); 96 96 printf("See %s for details of backup run.\n", MONDO_LOGFILE); 97 97 } … … 106 106 void distro_specific_kludges_at_start_of_mondoarchive() 107 107 { 108 log_msg(2, "Unmounting old ramdisks if necessary");108 mr_msg(2, "Unmounting old ramdisks if necessary"); 109 109 stop_magicdev_if_necessary(); // for RH+Gnome users 110 110 run_program_and_log_output … … 124 124 { 125 125 // char tmp[500]; 126 log_msg(2, "Restarting magicdev if necessary");126 mr_msg(2, "Restarting magicdev if necessary"); 127 127 sync(); 128 128 restart_magicdev_if_necessary(); // for RH+Gnome users 129 129 130 log_msg(2, "Restarting autofs if necessary");130 mr_msg(2, "Restarting autofs if necessary"); 131 131 sync(); 132 132 // restart_autofs_if_necessary(); // for Xandros users 133 133 134 log_msg(2, "Restarting supermounts if necessary");134 mr_msg(2, "Restarting supermounts if necessary"); 135 135 sync(); 136 136 remount_supermounts_if_necessary(); // for Mandrake users 137 137 138 log_msg(2, "Unmounting /boot if necessary");138 mr_msg(2, "Unmounting /boot if necessary"); 139 139 sync(); 140 140 unmount_boot_if_necessary(); // for Gentoo users 141 141 142 // log_msg( 2, "Cleaning up KDE desktop");142 // mr_msg( 2, "Cleaning up KDE desktop"); 143 143 // clean_up_KDE_desktop_if_necessary(); 144 144 } … … 189 189 /* initialize log file with time stamp */ 190 190 unlink(MONDO_LOGFILE); 191 log_msg(0, "Time started: %s", mr_date());191 mr_msg(0, "Time started: %s", mr_date()); 192 192 193 193 /* make sure PATH environmental variable allows access to mkfs, fdisk, etc. */ … … 215 215 /* Configure the bkpinfo structure, global file paths, etc. */ 216 216 g_main_pid = getpid(); 217 log_msg(9, "This");217 mr_msg(9, "This"); 218 218 219 219 register_pid(g_main_pid, "mondo"); … … 221 221 run_program_and_log_output("dmesg -n1", TRUE); 222 222 223 log_msg(9, "Next");223 mr_msg(9, "Next"); 224 224 welcome_to_mondoarchive(); 225 225 distro_specific_kludges_at_start_of_mondoarchive(); … … 340 340 ("Errors were detected in the command line you supplied.\n"); 341 341 printf("Please review the log file - " MONDO_LOGFILE "\n"); 342 log_msg(1, "Mondoarchive will now exit.");342 mr_msg(1, "Mondoarchive will now exit."); 343 343 finish(1); 344 344 } … … 410 410 ("Type 'less /tmp/changed.files' to see which files don't match the archives"); 411 411 } else { 412 log_msg(1,412 mr_msg(1, 413 413 "Type 'less /tmp/changed.files' to see which files don't match the archives"); 414 log_msg(2, "Calling popup_changelist_from_file()");414 mr_msg(2, "Calling popup_changelist_from_file()"); 415 415 popup_changelist_from_file("/tmp/changed.files"); 416 log_msg(2, "Returned from popup_changelist_from_file()");416 mr_msg(2, "Returned from popup_changelist_from_file()"); 417 417 } 418 418 } else { … … 447 447 448 448 if (!g_cdrom_drive_is_here) { 449 log_msg(10, "FYI, g_cdrom_drive_is_here was never used");449 mr_msg(10, "FYI, g_cdrom_drive_is_here was never used"); 450 450 } 451 451 if (!g_dvd_drive_is_here) { 452 log_msg(10, "FYI, g_dvd_drive_is_here was never used");452 mr_msg(10, "FYI, g_dvd_drive_is_here was never used"); 453 453 } 454 454 455 455 /* finalize log file with time stamp */ 456 log_msg(0, "Time finished: %s", mr_date());456 mr_msg(0, "Time finished: %s", mr_date()); 457 457 458 458 if (!g_text_mode) { -
branches/stable/mondo/src/mondoarchive/mondo-cli.c
r1080 r1108 109 109 { 110 110 */ 111 log_msg(3, "Switches:-");111 mr_msg(3, "Switches:-"); 112 112 for (i = 0; i < 128; i++) { 113 113 if (flag_set[i]) { 114 114 sprintf(tmp, "-%c %s", i, flag_val[i]); 115 log_msg(3, tmp);115 mr_msg(3, tmp); 116 116 } 117 117 } … … 162 162 sprintf(comment, "media_size[%d] = %ld", j, 163 163 bkpinfo->media_size[j]); 164 log_msg(3, comment);164 mr_msg(3, comment); 165 165 } 166 166 for (; j <= MAX_NOOF_MEDIA; j++) { … … 170 170 for (j = 1; j <= MAX_NOOF_MEDIA; j++) { 171 171 if (bkpinfo->media_size[j] <= 0) { 172 log_msg(1, "You gave media #%d an invalid size\n", j);172 mr_msg(1, "You gave media #%d an invalid size\n", j); 173 173 return (-1); 174 174 } … … 253 253 if (find_home_of_exe("star")) { 254 254 flag_set['R'] = TRUE; 255 log_msg(1, "Using star instead of afio");255 mr_msg(1, "Using star instead of afio"); 256 256 } else { 257 257 fatal_error … … 284 284 if (flag_set['I']) { 285 285 if (!strcmp(bkpinfo->include_paths, "/")) { 286 log_msg(2, "'/' is pleonastic.");286 mr_msg(2, "'/' is pleonastic."); 287 287 bkpinfo->include_paths[0] = '\0'; 288 288 } … … 300 300 *q = '\0'; 301 301 if (stat(p, &buf) != 0) { 302 log_msg(1, "ERROR ! %s doesn't exist", p);302 mr_msg(1, "ERROR ! %s doesn't exist", p); 303 303 fatal_error("ERROR ! You specified a directory to include which doesn't exist"); 304 304 } … … 306 306 } else { 307 307 if (stat(p, &buf) != 0) { 308 log_msg(1, "ERROR ! %s doesn't exist", p);308 mr_msg(1, "ERROR ! %s doesn't exist", p); 309 309 fatal_error("ERROR ! You specified a directory to include which doesn't exist"); 310 310 } … … 317 317 flag_val['I'], 318 318 4*MAX_STR_LEN - strlen(bkpinfo->include_paths)); 319 log_msg(1, "include_paths is now '%s'", bkpinfo->include_paths);319 mr_msg(1, "include_paths is now '%s'", bkpinfo->include_paths); 320 320 if (bkpinfo->include_paths[0] == '-') { 321 321 retval++; … … 374 374 } 375 375 } else { 376 log_msg(3, "flag_val['c'] = %s", flag_val['c']);377 log_msg(3, "flag_val['w'] = %s", flag_val['w']);378 // log_msg(3, "flag_set['r'] = %i", flag_set['r'] );376 mr_msg(3, "flag_val['c'] = %s", flag_val['c']); 377 mr_msg(3, "flag_val['w'] = %s", flag_val['w']); 378 // mr_msg(3, "flag_set['r'] = %i", flag_set['r'] ); 379 379 if (flag_set['c']) { 380 380 bkpinfo->cdrw_speed = atoi(flag_val['c']); … … 502 502 log_to_screen("NFS share is not mounted. Please mount it.\n"); 503 503 } 504 log_msg(3, "mount = %s", bkpinfo->nfs_mount);505 log_msg(3, "isodir= %s", bkpinfo->isodir);504 mr_msg(3, "mount = %s", bkpinfo->nfs_mount); 505 mr_msg(3, "isodir= %s", bkpinfo->isodir); 506 506 } 507 507 if (flag_set['c']) { … … 568 568 /* End of bug fix */ 569 569 if (stat(p, &buf) != 0) { 570 log_msg(1, "WARNING ! %s doesn't exist", p);570 mr_msg(1, "WARNING ! %s doesn't exist", p); 571 571 } 572 572 p = q+1 ; 573 573 } else { 574 574 if (stat(p, &buf) != 0) { 575 log_msg(1, "WARNING ! %s doesn't exist", p);575 mr_msg(1, "WARNING ! %s doesn't exist", p); 576 576 } 577 577 p = NULL; … … 595 595 } 596 596 strncat(bkpinfo->exclude_paths, psz, MAX_STR_LEN); 597 log_msg(3, "-N means we're now excluding %s",597 mr_msg(3, "-N means we're now excluding %s", 598 598 bkpinfo->exclude_paths); 599 599 } … … 604 604 if (flag_set['b']) { 605 605 strcpy(psz, flag_val['b']); 606 log_msg(1, "psz = '%s'", psz);606 mr_msg(1, "psz = '%s'", psz); 607 607 if (psz[strlen(psz) - 1] == 'k') { 608 608 psz[strlen(psz) - 1] = '\0'; … … 611 611 itbs = atol(psz); 612 612 } 613 log_msg(1, "'%s' --> %ld", flag_val['b'], itbs);614 log_msg(1, "Internal tape block size is now %ld bytes", itbs);613 mr_msg(1, "'%s' --> %ld", flag_val['b'], itbs); 614 mr_msg(1, "Internal tape block size is now %ld bytes", itbs); 615 615 if (itbs % 512 != 0 || itbs < 256 || itbs > 1024L * 1024) { 616 616 fatal_error … … 761 761 (BOOT_LOADER_CHARS, 762 762 (bkpinfo->boot_loader = flag_val['l'][0]))) { 763 log_msg(1, "%c? WTF is %c? I need G, L, E or R.",763 mr_msg(1, "%c? WTF is %c? I need G, L, E or R.", 764 764 bkpinfo->boot_loader, bkpinfo->boot_loader); 765 765 fatal_error … … 779 779 if (flag_set['Q']) { 780 780 i = which_boot_loader(tmp); 781 log_msg(3, "boot loader is %c, residing at %s", i, tmp);781 mr_msg(3, "boot loader is %c, residing at %s", i, tmp); 782 782 printf("boot loader is %c, residing at %s\n", i, tmp); 783 783 finish(0); … … 948 948 void help_screen() 949 949 { 950 log_msg(1, "Type 'man mondo-archive' for more information\n");950 mr_msg(1, "Type 'man mondo-archive' for more information\n"); 951 951 exit(1); 952 952 } … … 1044 1044 void termination_in_progress(int sig) 1045 1045 { 1046 log_msg(1, "Termination in progress");1046 mr_msg(1, "Termination in progress"); 1047 1047 usleep(1000); 1048 1048 pthread_exit(0);
Note:
See TracChangeset
for help on using the changeset viewer.