Changeset 1108 in MondoRescue

Timestamp:

Feb 8, 2007, 12:10:16 AM (18 years ago)

Author:

Bruno Cornec

Message:

log_msg => mr_msg for main files

Location:

branches/stable/mondo/src

Files:

• mondoarchive/main.c (modified) (9 diffs)
• mondoarchive/mondo-cli.c (modified) (18 diffs)
• mondorestore/mondo-prep.c (modified) (45 diffs)
• mondorestore/mondo-restore.c (modified) (102 diffs)
• mondorestore/mondo-rstr-compare.c (modified) (13 diffs)
• mondorestore/mondo-rstr-newt.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (71 diffs)

branches/stable/mondo/src/mondoarchive/main.c

@@ -61 +61 @@
 void welcome_to_mondoarchive()
 {
-    log_msg(0, "Mondo Archive v%s --- http://www.mondorescue.org",
+    mr_msg(0, "Mondo Archive v%s --- http://www.mondorescue.org",
             PACKAGE_VERSION);
-    log_msg(0, "running on %s architecture", get_architecture());
-    log_msg(0,
+    mr_msg(0, "running on %s architecture", get_architecture());
+    mr_msg(0,
             "-----------------------------------------------------------");
-    log_msg(0,
+    mr_msg(0,
             "NB: Mondo logs almost everything, so don't panic if you see");
-    log_msg(0,
+    mr_msg(0,
             "some error messages.  Please read them carefully before you");
-    log_msg(0,
+    mr_msg(0,
             "decide to break out in a cold sweat.    Despite (or perhaps");
-    log_msg(0,
+    mr_msg(0,
             "because of) the wealth of messages. some users are inclined");
-    log_msg(0,
+    mr_msg(0,
             "to stop reading this log. If Mondo stopped for some reason,");
-    log_msg(0,
+    mr_msg(0,
             "chances are it's detailed here.  More than likely there's a");
-    log_msg(0,
+    mr_msg(0,
             "message at the very end of this log that will tell you what");
-    log_msg(0,
+    mr_msg(0,
             "is wrong. Please read it!                          -Devteam");
-    log_msg(0,
+    mr_msg(0,
             "-----------------------------------------------------------");
 
-    log_msg(0, "Zero...");
-    log_msg(1, "One...");
-    log_msg(2, "Two...");
-    log_msg(3, "Three...");
-    log_msg(4, "Four...");
-    log_msg(5, "Five...");
-    log_msg(6, "Six...");
-    log_msg(7, "Seven...");
-    log_msg(8, "Eight...");
+    mr_msg(0, "Zero...");
+    mr_msg(1, "One...");
+    mr_msg(2, "Two...");
+    mr_msg(3, "Three...");
+    mr_msg(4, "Four...");
+    mr_msg(5, "Five...");
+    mr_msg(6, "Six...");
+    mr_msg(7, "Seven...");
+    mr_msg(8, "Eight...");
     printf("See %s for details of backup run.\n", MONDO_LOGFILE);
 }
@@ -106 +106 @@
 void distro_specific_kludges_at_start_of_mondoarchive()
 {
-    log_msg(2, "Unmounting old ramdisks if necessary");
+    mr_msg(2, "Unmounting old ramdisks if necessary");
     stop_magicdev_if_necessary();   // for RH+Gnome users
     run_program_and_log_output
@@ -124 +124 @@
 {
 //  char tmp[500];
-    log_msg(2, "Restarting magicdev if necessary");
+    mr_msg(2, "Restarting magicdev if necessary");
     sync();
     restart_magicdev_if_necessary();    // for RH+Gnome users
 
-    log_msg(2, "Restarting autofs if necessary");
+    mr_msg(2, "Restarting autofs if necessary");
     sync();
     //  restart_autofs_if_necessary(); // for Xandros users
 
-    log_msg(2, "Restarting supermounts if necessary");
+    mr_msg(2, "Restarting supermounts if necessary");
     sync();
     remount_supermounts_if_necessary(); // for Mandrake users
 
-    log_msg(2, "Unmounting /boot if necessary");
+    mr_msg(2, "Unmounting /boot if necessary");
     sync();
     unmount_boot_if_necessary();    // for Gentoo users
 
-//  log_msg( 2, "Cleaning up KDE desktop");
+//  mr_msg( 2, "Cleaning up KDE desktop");
 //  clean_up_KDE_desktop_if_necessary();
 }
@@ -189 +189 @@
     /* initialize log file with time stamp */
     unlink(MONDO_LOGFILE);
-    log_msg(0, "Time started: %s", mr_date());
+    mr_msg(0, "Time started: %s", mr_date());
 
     /* make sure PATH environmental variable allows access to mkfs, fdisk, etc. */
@@ -215 +215 @@
     /* Configure the bkpinfo structure, global file paths, etc. */
     g_main_pid = getpid();
-    log_msg(9, "This");
+    mr_msg(9, "This");
 
     register_pid(g_main_pid, "mondo");
@@ -221 +221 @@
     run_program_and_log_output("dmesg -n1", TRUE);
 
-    log_msg(9, "Next");
+    mr_msg(9, "Next");
     welcome_to_mondoarchive();
     distro_specific_kludges_at_start_of_mondoarchive();
@@ -340 +340 @@
                 ("Errors were detected in the command line you supplied.\n");
             printf("Please review the log file - " MONDO_LOGFILE "\n");
-            log_msg(1, "Mondoarchive will now exit.");
+            mr_msg(1, "Mondoarchive will now exit.");
             finish(1);
         }
@@ -410 +410 @@
                 ("Type 'less /tmp/changed.files' to see which files don't match the archives");
         } else {
-            log_msg(1,
+            mr_msg(1,
                     "Type 'less /tmp/changed.files' to see which files don't match the archives");
-            log_msg(2, "Calling popup_changelist_from_file()");
+            mr_msg(2, "Calling popup_changelist_from_file()");
             popup_changelist_from_file("/tmp/changed.files");
-            log_msg(2, "Returned from popup_changelist_from_file()");
+            mr_msg(2, "Returned from popup_changelist_from_file()");
         }
     } else {
@@ -447 +447 @@
 
     if (!g_cdrom_drive_is_here) {
-        log_msg(10, "FYI, g_cdrom_drive_is_here was never used");
+        mr_msg(10, "FYI, g_cdrom_drive_is_here was never used");
     }
     if (!g_dvd_drive_is_here) {
-        log_msg(10, "FYI, g_dvd_drive_is_here was never used");
+        mr_msg(10, "FYI, g_dvd_drive_is_here was never used");
     }
 
     /* finalize log file with time stamp */
-    log_msg(0, "Time finished: %s", mr_date());
+    mr_msg(0, "Time finished: %s", mr_date());
 
     if (!g_text_mode) {

branches/stable/mondo/src/mondoarchive/mondo-cli.c

@@ -109 +109 @@
     {
 */
-    log_msg(3, "Switches:-");
+    mr_msg(3, "Switches:-");
     for (i = 0; i < 128; i++) {
         if (flag_set[i]) {
             sprintf(tmp, "-%c %s", i, flag_val[i]);
-            log_msg(3, tmp);
+            mr_msg(3, tmp);
         }
     }
@@ -162 +162 @@
         sprintf(comment, "media_size[%d] = %ld", j,
                 bkpinfo->media_size[j]);
-        log_msg(3, comment);
+        mr_msg(3, comment);
     }
     for (; j <= MAX_NOOF_MEDIA; j++) {
@@ -170 +170 @@
     for (j = 1; j <= MAX_NOOF_MEDIA; j++) {
         if (bkpinfo->media_size[j] <= 0) {
-            log_msg(1, "You gave media #%d an invalid size\n", j);
+            mr_msg(1, "You gave media #%d an invalid size\n", j);
             return (-1);
         }
@@ -253 +253 @@
         if (find_home_of_exe("star")) {
             flag_set['R'] = TRUE;
-            log_msg(1, "Using star instead of afio");
+            mr_msg(1, "Using star instead of afio");
         } else {
             fatal_error
@@ -284 +284 @@
     if (flag_set['I']) {
         if (!strcmp(bkpinfo->include_paths, "/")) {
-            log_msg(2, "'/' is pleonastic.");
+            mr_msg(2, "'/' is pleonastic.");
             bkpinfo->include_paths[0] = '\0';
         }
@@ -300 +300 @@
                 *q = '\0';
                 if (stat(p, &buf) != 0) {
-                    log_msg(1, "ERROR ! %s doesn't exist", p);
+                    mr_msg(1, "ERROR ! %s doesn't exist", p);
                     fatal_error("ERROR ! You specified a directory to include which doesn't exist");
                 }
@@ -306 +306 @@
             } else {
                 if (stat(p, &buf) != 0) {
-                    log_msg(1, "ERROR ! %s doesn't exist", p);
+                    mr_msg(1, "ERROR ! %s doesn't exist", p);
                     fatal_error("ERROR ! You specified a directory to include which doesn't exist");
                 }
@@ -317 +317 @@
                 flag_val['I'],
                 4*MAX_STR_LEN - strlen(bkpinfo->include_paths));
-        log_msg(1, "include_paths is now '%s'", bkpinfo->include_paths);
+        mr_msg(1, "include_paths is now '%s'", bkpinfo->include_paths);
         if (bkpinfo->include_paths[0] == '-') {
             retval++;
@@ -374 +374 @@
             }
         } else {
-            log_msg(3, "flag_val['c'] = %s", flag_val['c']);
-            log_msg(3, "flag_val['w'] = %s", flag_val['w']);
-//    log_msg(3, "flag_set['r'] = %i", flag_set['r'] );
+            mr_msg(3, "flag_val['c'] = %s", flag_val['c']);
+            mr_msg(3, "flag_val['w'] = %s", flag_val['w']);
+//    mr_msg(3, "flag_set['r'] = %i", flag_set['r'] );
             if (flag_set['c']) {
                 bkpinfo->cdrw_speed = atoi(flag_val['c']);
@@ -502 +502 @@
             log_to_screen("NFS share is not mounted. Please mount it.\n");
         }
-        log_msg(3, "mount = %s", bkpinfo->nfs_mount);
-        log_msg(3, "isodir= %s", bkpinfo->isodir);
+        mr_msg(3, "mount = %s", bkpinfo->nfs_mount);
+        mr_msg(3, "isodir= %s", bkpinfo->isodir);
     }
     if (flag_set['c']) {
@@ -568 +568 @@
                 /* End of bug fix */
                 if (stat(p, &buf) != 0) {
-                    log_msg(1, "WARNING ! %s doesn't exist", p);
+                    mr_msg(1, "WARNING ! %s doesn't exist", p);
                 }
                 p = q+1 ;
             } else {
                 if (stat(p, &buf) != 0) {
-                    log_msg(1, "WARNING ! %s doesn't exist", p);
+                    mr_msg(1, "WARNING ! %s doesn't exist", p);
                 }
                 p = NULL;
@@ -595 +595 @@
         }
         strncat(bkpinfo->exclude_paths, psz, MAX_STR_LEN);
-        log_msg(3, "-N means we're now excluding %s",
+        mr_msg(3, "-N means we're now excluding %s",
                 bkpinfo->exclude_paths);
     }
@@ -604 +604 @@
     if (flag_set['b']) {
         strcpy(psz, flag_val['b']);
-        log_msg(1, "psz = '%s'", psz);
+        mr_msg(1, "psz = '%s'", psz);
         if (psz[strlen(psz) - 1] == 'k') {
             psz[strlen(psz) - 1] = '\0';
@@ -611 +611 @@
             itbs = atol(psz);
         }
-        log_msg(1, "'%s' --> %ld", flag_val['b'], itbs);
-        log_msg(1, "Internal tape block size is now %ld bytes", itbs);
+        mr_msg(1, "'%s' --> %ld", flag_val['b'], itbs);
+        mr_msg(1, "Internal tape block size is now %ld bytes", itbs);
         if (itbs % 512 != 0 || itbs < 256 || itbs > 1024L * 1024) {
             fatal_error
@@ -761 +761 @@
             (BOOT_LOADER_CHARS,
              (bkpinfo->boot_loader = flag_val['l'][0]))) {
-            log_msg(1, "%c? WTF is %c? I need G, L, E or R.",
+            mr_msg(1, "%c? WTF is %c? I need G, L, E or R.",
                     bkpinfo->boot_loader, bkpinfo->boot_loader);
             fatal_error
@@ -779 +779 @@
     if (flag_set['Q']) {
         i = which_boot_loader(tmp);
-        log_msg(3, "boot loader is %c, residing at %s", i, tmp);
+        mr_msg(3, "boot loader is %c, residing at %s", i, tmp);
         printf("boot loader is %c, residing at %s\n", i, tmp);
         finish(0);
@@ -948 +948 @@
 void help_screen()
 {
-    log_msg(1, "Type 'man mondo-archive' for more information\n");
+    mr_msg(1, "Type 'man mondo-archive' for more information\n");
     exit(1);
 }
@@ -1044 +1044 @@
 void termination_in_progress(int sig)
 {
-    log_msg(1, "Termination in progress");
+    mr_msg(1, "Termination in progress");
     usleep(1000);
     pthread_exit(0);

branches/stable/mondo/src/mondorestore/mondo-prep.c

@@ -86 +86 @@
                     drivelist->el[lino].device, MONDO_WAS_HERE);
             if (!run_program_and_log_output(command, 1)) {
-                log_msg(1, "Found MONDO_WAS_HERE marker on drive#%d (%s)",
+                mr_msg(1, "Found MONDO_WAS_HERE marker on drive#%d (%s)",
                         lino, drivelist->el[lino].device);
                 break;
@@ -108 +108 @@
                 fout = fopen(drivelist->el[lino].device, "w+");
                 if (!fout) {
-                    log_msg(1, "Unable to open+wipe %s",
+                    mr_msg(1, "Unable to open+wipe %s",
                             drivelist->el[lino].device);
                 } else {
                     if (1 != fwrite(buf, blocksize, 1, fout)) {
-                        log_msg(1, "Failed to wipe %s",
+                        mr_msg(1, "Failed to wipe %s",
                                 drivelist->el[lino].device);
                     } else {
-                        log_msg(1, "Successfully wiped %s",
+                        mr_msg(1, "Successfully wiped %s",
                                 drivelist->el[lino].device);
                     }
@@ -132 +132 @@
     mr_free(command);
     mr_free(tmp);
-    log_msg(1, "Cool. I didn't have to wipe anything.");
+    mr_msg(1, "Cool. I didn't have to wipe anything.");
 }
 
@@ -148 +148 @@
         return (-1);
     }
-    log_msg(5, "Writing string '%s', one char at a time", str);
+    mr_msg(5, "Writing string '%s', one char at a time", str);
     j = strlen(str);
     for (i = 0; i < j; i++) {
-        log_msg(6, "Writing %d ('%c')", str[i], str[i]);
+        mr_msg(6, "Writing %d ('%c')", str[i], str[i]);
         if ((fq = fopen(FDISK_LOG, "a+"))) {
             fputc(str[i], fq);
@@ -163 +163 @@
         }
     }
-    log_msg(5, "Returning");
+    mr_msg(5, "Returning");
 
     return (i);
@@ -244 +244 @@
 //  do_this_last[0] = '\0';
     iamhere("STARTING");
-    log_msg(1, "OK, opened i-want-my-lvm. Shutting down LVM volumes...");
+    mr_msg(1, "OK, opened i-want-my-lvm. Shutting down LVM volumes...");
     if (find_home_of_exe("lvm"))    // found it :) cool
     {
@@ -274 +274 @@
     if (just_erase_existing_volumes) {
         paranoid_fclose(fin);
-        log_msg(1, "Closed i-want-my-lvm. Finished erasing LVMs.");
+        mr_msg(1, "Closed i-want-my-lvm. Finished erasing LVMs.");
         retval = 0;
         goto end_of_i_want_my_lvm;
     }
 
-    log_msg(1, "OK, rewound i-want-my-lvm. Doing funky stuff...");
+    mr_msg(1, "OK, rewound i-want-my-lvm. Doing funky stuff...");
     rewind(fin);
     for (fgets(incoming, 512, fin); !feof(fin); fgets(incoming, 512, fin)) {
@@ -311 +311 @@
             for (q = tmp; *q > 32; q++);
             *q = '\0';
-            log_msg(1, "Deleting old entries at /dev/%s", tmp);
+            mr_msg(1, "Deleting old entries at /dev/%s", tmp);
 //             sprintf(command, "%s -f %s", vgremove_sz, tmp);
 //             run_program_and_log_output(command, 1);
@@ -318 +318 @@
             run_program_and_log_output(vgscan_sz, 1);
             run_program_and_log_output(pvscan_sz, 1);
-            log_msg(3,
+            mr_msg(3,
                     "After working around potentially broken i-want-my-lvm, incoming[] is now '%s'",
                     incoming);
@@ -332 +332 @@
             res = run_program_and_log_output(command, 5);
         }
-        log_msg(0, "%s --> %d", command, res);
+        mr_msg(0, "%s --> %d", command, res);
         if (res > 0) {
             res = 1;
@@ -350 +350 @@
             for (p = tmp; *p != '\0' && !isdigit(*p); p++);
             extents = atol(p);
-            log_msg(5, "p='%s' --> extents=%ld", p, extents);
+            mr_msg(5, "p='%s' --> extents=%ld", p, extents);
             p = strstr(command, "-L");
             if (!p) {
-                log_msg(0, "Fiddlesticks. '%s' returned %d", command, res);
+                mr_msg(0, "Fiddlesticks. '%s' returned %d", command, res);
             } else {
                 if (lvmversion == 2) {
@@ -376 +376 @@
                     *(p + i) = ' ';
                 }
-                log_msg(5, "Retrying with '%s'", command);
+                mr_msg(5, "Retrying with '%s'", command);
                 res = run_program_and_log_output(command, 5);
                 if (res > 0) {
@@ -384 +384 @@
                     fprintf(g_fprep, "%s\n", command);
                 }
-                log_msg(0, "%s --> %d", command, res);
+                mr_msg(0, "%s --> %d", command, res);
                 if (!res) {
-                    log_msg(5, "YAY! This time, it succeeded.");
+                    mr_msg(5, "YAY! This time, it succeeded.");
                 }
             }
         }
         if (strstr(command, "vgcreate")) {
-            log_msg(0, "In case you're interested...");
+            mr_msg(0, "In case you're interested...");
             run_program_and_log_output(vgscan_sz, 1);
             run_program_and_log_output(pvscan_sz, 1);
@@ -403 +403 @@
     }
     paranoid_fclose(fin);
-    log_msg(1, "Closed i-want-my-lvm. Finished doing funky stuff.");
+    mr_msg(1, "Closed i-want-my-lvm. Finished doing funky stuff.");
   end_of_i_want_my_lvm:
     mr_free(tmp);
@@ -422 +422 @@
     iamhere("ENDING");
     if (retval > 2) {
-        log_msg(1, "%d errors. I'm reporting this.", retval);
+        mr_msg(1, "%d errors. I'm reporting this.", retval);
         return (retval);
     } else {
-        log_msg(1, "Not many errors. Returning 0.");
+        mr_msg(1, "Not many errors. Returning 0.");
         return (0);
     }
@@ -572 +572 @@
   // leave straight away if raidlist is initial or has no entries
   if (!raidlist || raidlist->entries == 0) {
-    log_msg(1, "No RAID arrays found.");
+    mr_msg(1, "No RAID arrays found.");
     return 1;
   } else {
-    log_msg(1, "%d RAID arrays found.", raidlist->entries);
+    mr_msg(1, "%d RAID arrays found.", raidlist->entries);
   }
   // find raidlist entry for requested device
@@ -583 +583 @@
   // check whether RAID device was found in raidlist
   if (i == raidlist->entries) {
-    log_msg(1, "RAID device %s not found in list.", device);
+    mr_msg(1, "RAID device %s not found in list.", device);
     return 1;
   }
@@ -809 +809 @@
         }
 
-        log_msg(1, "Making %s", device);
+        mr_msg(1, "Making %s", device);
         // use mkraid if it exists, otherwise use mdadm
         if (run_program_and_log_output("which mkraid", FALSE)) {
             res = create_raid_device_via_mdadm(raidlist, device);
-            log_msg(1, "Creating RAID device %s via mdadm returned %d", device, res);
+            mr_msg(1, "Creating RAID device %s via mdadm returned %d", device, res);
         } else {
             sprintf(program, "mkraid --really-force %s", device);
             res = run_program_and_log_output(program, 1);
-            log_msg(1, "%s returned %d", program, res);
+            mr_msg(1, "%s returned %d", program, res);
             system("sync");
             sleep(3);
@@ -830 +830 @@
 //      sprintf(program, "raidstart %s", device);
 //      res = run_program_and_log_output(program, 1);
-//      log_msg(1, "%s returned %d", program, res);
+//      mr_msg(1, "%s returned %d", program, res);
 //      system("sync"); sleep(1);
 #endif
@@ -841 +841 @@
 
     if (!strcmp(format, "lvm")) {
-        log_msg(1, "Don't format %s - it's part of an lvm volume", device);
+        mr_msg(1, "Don't format %s - it's part of an lvm volume", device);
         mr_free(program);
         mr_free(tmp);
@@ -938 +938 @@
 // start soft-raids now (because LVM might depend on them)
 // ...and for simplicity's sake, let's format them at the same time :)
-    log_msg(1, "Stopping all RAID devices");
+    mr_msg(1, "Stopping all RAID devices");
     stop_all_raid_devices(mountlist);
     system("sync");
@@ -944 +944 @@
     system("sync");
     sleep(2);
-    log_msg(1, "Prepare soft-RAIDs");   // prep and format too
+    mr_msg(1, "Prepare soft-RAIDs");    // prep and format too
     for (lino = 0; lino < mountlist->entries; lino++) {
         me = &mountlist->el[lino];  // the current mountlist entry
-        log_msg(2, "Examining %s", me->device);
+        mr_msg(2, "Examining %s", me->device);
         if (!strncmp(me->device, "/dev/md", 7)) {
             if (interactively) {
@@ -974 +974 @@
 //  sleep(5);
 // do LVMs now
-    log_msg(1, "Creating LVMs");
+    mr_msg(1, "Creating LVMs");
     if (does_file_exist("/tmp/i-want-my-lvm")) {
         wait_until_software_raids_are_prepped("/proc/mdstat", 100);
@@ -991 +991 @@
           }
         if (res) {
-            log_msg(1, "Vacuum-packing...");
+            mr_msg(1, "Vacuum-packing...");
 */
         res = do_my_funky_lvm_stuff(FALSE, TRUE);
@@ -1013 +1013 @@
 // do regulars at last
     sleep(2);                   // woo!
-    log_msg(1, "Formatting regulars");
+    mr_msg(1, "Formatting regulars");
     for (lino = 0; lino < mountlist->entries; lino++) {
         me = &mountlist->el[lino];  // the current mountlist entry
@@ -1668 +1668 @@
         system("sync");
         paranoid_pclose(pout_to_fdisk);
-        log_msg(0,
+        mr_msg(0,
                 "------------------- fdisk.log looks like this ------------------");
         sprintf(tmp, "cat %s >> %s", FDISK_LOG, MONDO_LOGFILE);
         system(tmp);
-        log_msg(0,
+        mr_msg(0,
                 "------------------- end of fdisk.log... word! ------------------");
         sprintf(tmp, "tail -n6 %s | grep -F \"16: \"", FDISK_LOG);
@@ -1809 +1809 @@
     if (partsize > 0) {
         if (!strcmp(format, "7")) {
-            log_msg(1, "Adding 512K, just in case");
+            mr_msg(1, "Adding 512K, just in case");
             partsize += 512;
         }
@@ -1829 +1829 @@
 
     if (pout_to_fdisk) {
-        log_msg(1, "Doing the new all-in-one fdisk thing");
-        log_msg(1, "output = '%s'", output);
+        mr_msg(1, "Doing the new all-in-one fdisk thing");
+        mr_msg(1, "output = '%s'", output);
         fput_string_one_char_at_a_time(pout_to_fdisk, output);
         fput_string_one_char_at_a_time(pout_to_fdisk, "\n\np\n");
         strcpy(tmp, last_line_of_file(FDISK_LOG));
         if (strstr(tmp, " (m ")) {
-            log_msg(1, "Successfully created %s%d", drive, partno);
+            mr_msg(1, "Successfully created %s%d", drive, partno);
         } else {
-            log_msg(1, "last line = %s", tmp);
-            log_msg(1, "Failed to create %s%d; sending 'Enter'...", drive,
+            mr_msg(1, "last line = %s", tmp);
+            mr_msg(1, "Failed to create %s%d; sending 'Enter'...", drive,
                     partno);
         }
         if (!retval) {
-            log_msg(1, "Trying to set %s%d's partition type now", drive,
+            mr_msg(1, "Trying to set %s%d's partition type now", drive,
                     partno);
             retval =
@@ -1848 +1848 @@
                                    partsize);
             if (retval) {
-                log_msg(1, "Failed. Trying again...");
+                mr_msg(1, "Failed. Trying again...");
                 retval =
                     set_partition_type(pout_to_fdisk, drive, partno,
@@ -1855 +1855 @@
         }
         if (retval) {
-            log_msg(1, "...but failed to set type");
+            mr_msg(1, "...but failed to set type");
         }
     } else {
@@ -1952 +1952 @@
         /*      mountlist=&new_mtlist; */
         /*      extrapolate_mountlist_to_include_raid_partitions(mountlist,orig_mtlist); */
-        log_msg(0,
+        mr_msg(0,
                 "Mountlist, including the partitions incorporated in RAID devices:-");
         for (i = 0; i < mountlist->entries; i++) {
             log_it(mountlist->el[i].device);
         }
-        log_msg(0, "End of mountlist.");
-    }
-    log_msg(0, "Stopping all LVMs, just in case");
+        mr_msg(0, "End of mountlist.");
+    }
+    mr_msg(0, "Stopping all LVMs, just in case");
     if (!g_text_mode) {
         newtSuspend();
@@ -1967 +1967 @@
         newtResume();
     }
-    log_msg(0, "Stopping all software RAID devices, just in case");
+    mr_msg(0, "Stopping all software RAID devices, just in case");
     stop_all_raid_devices(mountlist);
-    log_msg(0, "Done.");
+    mr_msg(0, "Done.");
 
 /*  
@@ -2093 +2093 @@
     sprintf(tmp, "Setting %s's type to %s (%s)", partition, format,
             partcode);
-    log_msg(1, tmp);
+    mr_msg(1, tmp);
     if (partcode[0] != '\0' && strcmp(partcode, "83")) {    /* no need to set type if 83: 83 is default */
 
@@ -2101 +2101 @@
             if (partno > 1
                 || strstr(last_line_of_file(FDISK_LOG), " (1-4)")) {
-                log_msg(5, "Specifying partno (%d) - yay", partno);
+                mr_msg(5, "Specifying partno (%d) - yay", partno);
                 sprintf(tmp, "%d\n", partno);
                 fput_string_one_char_at_a_time(pout_to_fdisk, tmp);
-                log_msg(5, "A - last line = '%s'",
+                mr_msg(5, "A - last line = '%s'",
                         last_line_of_file(FDISK_LOG));
             }
@@ -2110 +2110 @@
             sprintf(tmp, "%s\n", partcode);
             fput_string_one_char_at_a_time(pout_to_fdisk, tmp);
-            log_msg(5, "B - last line = '%s'",
+            mr_msg(5, "B - last line = '%s'",
                     last_line_of_file(FDISK_LOG));
             fput_string_one_char_at_a_time(pout_to_fdisk, "\n");
-            log_msg(5, "C - last line = '%s'",
+            mr_msg(5, "C - last line = '%s'",
                     last_line_of_file(FDISK_LOG));
 
             strcpy(tmp, last_line_of_file(FDISK_LOG));
             if (!strstr(tmp, " (m ")) {
-                log_msg(1, "last line = '%s'; part type set failed", tmp);
+                mr_msg(1, "last line = '%s'; part type set failed", tmp);
                 res++;
                 fput_string_one_char_at_a_time(pout_to_fdisk, "\n");
@@ -2128 +2128 @@
             sprintf(command, "parted2fdisk %s >> %s 2>> %s", drive,
                     MONDO_LOGFILE, MONDO_LOGFILE);
-            log_msg(5, "output = '%s'", output);
-            log_msg(5, "partno=%d; partcode=%s", partno, partcode);
-            log_msg(5, "command = '%s'", command);
+            mr_msg(5, "output = '%s'", output);
+            mr_msg(5, "partno=%d; partcode=%s", partno, partcode);
+            mr_msg(5, "command = '%s'", command);
             fout = popen(command, "w");
             if (!fout) {
@@ -2180 +2180 @@
     sprintf(program, "raidstart %s", raid_device);
 #endif
-    log_msg(1, "program = %s", program);
+    mr_msg(1, "program = %s", program);
     res = run_program_and_log_output(program, 1);
     if (g_fprep) {
@@ -2186 +2186 @@
     }
     if (res) {
-        log_msg(1, "Warning - failed to start RAID device %s",
+        mr_msg(1, "Warning - failed to start RAID device %s",
                 raid_device);
     }
@@ -2229 +2229 @@
     }
 #endif
-    log_msg(1, "program = %s", program);
+    mr_msg(1, "program = %s", program);
     res = run_program_and_log_output(program, 1);
     if (g_fprep) {
@@ -2235 +2235 @@
     }
     if (res) {
-        log_msg(1, "Warning - failed to stop RAID device %s", raid_device);
+        mr_msg(1, "Warning - failed to stop RAID device %s", raid_device);
     }
     retval += res;
@@ -2252 +2252 @@
             (mountlist->el[i].device, RAID_DEVICE_STUB,
              strlen(RAID_DEVICE_STUB))) {
-            log_msg(1, "Starting %s", mountlist->el[i].device);
+            mr_msg(1, "Starting %s", mountlist->el[i].device);
             res = start_raid_device(mountlist->el[i].device);
             retval += res;
@@ -2258 +2258 @@
     }
     if (retval) {
-        log_msg(1, "Started all s/w raid devices OK");
+        mr_msg(1, "Started all s/w raid devices OK");
     } else {
-        log_msg(1, "Failed to start some/all s/w raid devices");
+        mr_msg(1, "Failed to start some/all s/w raid devices");
     }
     return (retval);
@@ -2336 +2336 @@
     paranoid_fclose(fin);
     if (retval) {
-        log_msg(1, "Warning - unable to stop some RAID devices");
+        mr_msg(1, "Warning - unable to stop some RAID devices");
     }
     mr_free(dev);
@@ -2550 +2550 @@
 
         if (!strcmp(drivemntlist->el[partno]->mountpoint, "image")) {
-            log_msg(1, "Skipping %s (%s) because it's an image",
+            mr_msg(1, "Skipping %s (%s) because it's an image",
                     drivemntlist->el[partno]->device,
                     drivemntlist->el[partno]->mountpoint);
@@ -2627 +2627 @@
     assert(drivemntlist != NULL);
 
-    log_msg(1, "Creating list of partitions for drive %s", drive_name);
+    mr_msg(1, "Creating list of partitions for drive %s", drive_name);
 
     tmp_drive_name = strdup(drive_name);

branches/stable/mondo/src/mondorestore/mondo-restore.c

@@ -163 +163 @@
     int retval = 0, res = 0;
 
-    log_msg(2, "let_user_edit_the_mountlist() --- starting");
+    mr_msg(2, "let_user_edit_the_mountlist() --- starting");
 
     assert(bkpinfo != NULL);
@@ -170 +170 @@
     if (!bkpinfo->disaster_recovery) {
         strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
-        log_msg(2, "I guess you're testing edit_mountlist()");
+        mr_msg(2, "I guess you're testing edit_mountlist()");
     }
     if (!does_file_exist(g_mountlist_fname)) {
@@ -218 +218 @@
     for (i = 0; i < mountlist->entries; i++) {
         if (strstr(mountlist->el[i].format, "ompaq")) {
-            log_msg(2, "mountlist[%d] (%s) is %s (Compaq alert!)",
+            mr_msg(2, "mountlist[%d] (%s) is %s (Compaq alert!)",
                     i, mountlist->el[i].device, mountlist->el[i].format);
 
@@ -296 +296 @@
     if (bkpinfo->backup_media_type == iso) {
         if (iso_fiddly_bits(bkpinfo, (c == 'N') ? TRUE : FALSE)) {
-            log_msg(2,
+            mr_msg(2,
                     "catchall_mode --- iso_fiddly_bits returned w/ error");
             return (1);
         } else {
-            log_msg(2, "catchall_mode --- iso_fiddly_bits ok");
+            mr_msg(2, "catchall_mode --- iso_fiddly_bits ok");
         }
     }
 
     if (c == 'I') {
-        log_msg(2, "IM selected");
+        mr_msg(2, "IM selected");
         retval += interactive_mode(bkpinfo, mountlist, raidlist);
     } else if (c == 'N') {
-        log_msg(2, "NM selected");
+        mr_msg(2, "NM selected");
         retval += nuke_mode(bkpinfo, mountlist, raidlist);
     } else if (c == 'C') {
-        log_msg(2, "CM selected");
+        mr_msg(2, "CM selected");
         retval += compare_mode(bkpinfo, mountlist, raidlist);
     }
@@ -400 +400 @@
     /* try to partition and format */
 
-    log_msg(2, "interactive_mode --- starting (great, assertions OK)");
+    mr_msg(2, "interactive_mode --- starting (great, assertions OK)");
 
     malloc_string(tmp);
@@ -409 +409 @@
     assert(raidlist != NULL);
 
-    log_msg(2, "interactive_mode --- assertions OK");
+    mr_msg(2, "interactive_mode --- assertions OK");
 
     if (g_text_mode) {
@@ -433 +433 @@
 #endif
     {
-        log_msg(1, "Not resizing mountlist.");
+        mr_msg(1, "Not resizing mountlist.");
     } else {
         resize_mountlist_proportionately_to_suit_new_drives(mountlist);
@@ -451 +451 @@
             paranoid_MR_finish(1);
         }
-        log_msg(2, "Proceeding...");
+        mr_msg(2, "Proceeding...");
         save_mountlist_to_disk(mountlist, g_mountlist_fname);
         save_raidlist_to_raidtab(raidlist, RAIDTAB_FNAME);
@@ -534 +534 @@
          ask_me_yes_or_no("Do you want me to restore all of your data?")))
     {
-        log_msg(1, "Restoring all data");
+        mr_msg(1, "Restoring all data");
         retval += restore_everything(bkpinfo, NULL);
     } else
@@ -561 +561 @@
                     }
                     strcpy(bkpinfo->restore_path, tmp);
-                    log_msg(1, "Restoring subset");
+                    mr_msg(1, "Restoring subset");
                     retval += restore_everything(bkpinfo, filelist);
                     free_filelist(filelist);
@@ -666 +666 @@
     assert(raidlist != NULL);
     if (iso_fiddly_bits(bkpinfo, nuke_me_please)) {
-        log_msg(1, "iso_mode --- returning w/ error");
+        mr_msg(1, "iso_mode --- returning w/ error");
         return (1);
     } else {
@@ -732 +732 @@
     assert(raidlist != NULL);
 
-    log_msg(2, "nuke_mode --- starting");
+    mr_msg(2, "nuke_mode --- starting");
 
     get_cfg_file_from_archive_or_bust(bkpinfo);
@@ -746 +746 @@
 #endif
     {
-        log_msg(2, "Not resizing mountlist.");
+        mr_msg(2, "Not resizing mountlist.");
     } else {
         resize_mountlist_proportionately_to_suit_new_drives(mountlist);
@@ -784 +784 @@
 #endif
             {
-                log_msg(2,
+                mr_msg(2,
                         "Not partitioning drives due to 'nopart' option.");
                 res = 0;
@@ -831 +831 @@
     retval += restore_everything(bkpinfo, NULL);
     if (!run_boot_loader(FALSE)) {
-        log_msg(1,
+        mr_msg(1,
                 "Great! Boot loader was installed. No need for msg at end.");
         boot_loader_installed = TRUE;
@@ -910 +910 @@
     struct s_node *filelist;
 
-    log_msg(1, "restore_to_live_filesystem() - starting");
+    mr_msg(1, "restore_to_live_filesystem() - starting");
     assert(bkpinfo != NULL);
     malloc_string(old_restpath);
@@ -923 +923 @@
     }
     interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
-    log_msg(2, "bkpinfo->media_device = %s", bkpinfo->media_device);
+    mr_msg(2, "bkpinfo->media_device = %s", bkpinfo->media_device);
     if (!bkpinfo->media_device[0]) {
-        log_msg(2, "Warning - failed to find media dev");
-    }
-
-
-    log_msg(2, "bkpinfo->isodir = %s", bkpinfo->isodir);
+        mr_msg(2, "Warning - failed to find media dev");
+    }
+
+
+    mr_msg(2, "bkpinfo->isodir = %s", bkpinfo->isodir);
 
     open_evalcall_form("Thinking...");
@@ -957 +957 @@
     }
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        log_msg(2,
+        mr_msg(2,
                 "I probably don't need to unmount or eject the CD-ROM but I'm doing it anyway.");
     }
@@ -1046 +1046 @@
     if (fread((void *) &biggiestruct, 1, sizeof(biggiestruct), fin) <
         sizeof(biggiestruct)) {
-        log_msg(2, "Warning - unable to get biggiestruct of bigfile #%d",
+        mr_msg(2, "Warning - unable to get biggiestruct of bigfile #%d",
                 bigfileno + 1);
     }
@@ -1056 +1056 @@
         sprintf(tmp, "Warning - bigfile %ld does not have a checksum",
                 bigfileno + 1);
-        log_msg(3, tmp);
+        mr_msg(3, tmp);
         p = checksum;
     }
@@ -1072 +1072 @@
         node = find_string_at_node(filelist, biggiestruct.filename);
         if (!node) {
-            log_msg(0, "Skipping %s (name isn't in filelist)",
+            mr_msg(0, "Skipping %s (name isn't in filelist)",
                     biggiestruct.filename);
             pathname_of_last_file_restored[0] = '\0';
             return (0);
         } else if (!(node->selected)) {
-            log_msg(1, "Skipping %s (name isn't in biggielist subset)",
+            mr_msg(1, "Skipping %s (name isn't in biggielist subset)",
                     biggiestruct.filename);
             pathname_of_last_file_restored[0] = '\0';
@@ -1085 +1085 @@
     /* otherwise, continue */
 
-    log_msg(1, "DEFINITELY restoring %s", biggiestruct.filename);
+    mr_msg(1, "DEFINITELY restoring %s", biggiestruct.filename);
     if (biggiestruct.use_ntfsprog) {
         if (strncmp(biggiestruct.filename, "/dev/", 5)) {
-            log_msg(1,
+            mr_msg(1,
                     "I was in error when I set biggiestruct.use_ntfsprog to TRUE.");
-            log_msg(1, "%s isn't even in /dev", biggiestruct.filename);
+            mr_msg(1, "%s isn't even in /dev", biggiestruct.filename);
             biggiestruct.use_ntfsprog = FALSE;
         }
@@ -1100 +1100 @@
         g_loglevel = 4;
         use_ntfsprog_hack = TRUE;
-        log_msg(2,
+        mr_msg(2,
                 "Calling ntfsclone in background because %s is an NTFS /dev entry",
                 outfile_fname);
@@ -1112 +1112 @@
             fatal_error("Fork failure");
         case 0:
-            log_msg(3,
+            mr_msg(3,
                     "CHILD - fip - calling feed_outfrom_ntfsprog(%s, %s)",
                     biggiestruct.filename, ntfsprog_fifo);
@@ -1118 +1118 @@
                 feed_outfrom_ntfsprog(biggiestruct.filename,
                                        ntfsprog_fifo);
-//          log_msg(3, "CHILD - fip - exiting");
+//          mr_msg(3, "CHILD - fip - exiting");
             exit(res);
             break;
         default:
-            log_msg(3,
+            mr_msg(3,
                     "feed_into_ntfsprog() called in background --- pid=%ld",
                     (long int) (pid));
@@ -1138 +1138 @@
     sprintf(tmp, "Reassembling big file %ld (%s)", bigfileno + 1,
             outfile_fname);
-    log_msg(2, tmp);
+    mr_msg(2, tmp);
 
     /*
@@ -1150 +1150 @@
     pathname_of_last_file_restored[MAX_STR_LEN - 1] = '\0';
 
-    log_msg(3, "file_to_openout = %s", file_to_openout);
+    mr_msg(3, "file_to_openout = %s", file_to_openout);
     if (!(fout = fopen(file_to_openout, "w"))) {
         log_to_screen("Cannot openout outfile_fname - hard disk full?");
         return (1);
     }
-    log_msg(3, "Opened out to %s", outfile_fname);  // CD/DVD --> mondorestore --> ntfsclone --> hard disk itself
+    mr_msg(3, "Opened out to %s", outfile_fname);   // CD/DVD --> mondorestore --> ntfsclone --> hard disk itself
 
     for (sliceno = 1, finished = FALSE; !finished;) {
@@ -1169 +1169 @@
             !does_file_exist(slice_fname
                              (bigfileno, sliceno, ARCHIVES_PATH, "bz2"))) {
-            log_msg(3,
+            mr_msg(3,
                     "Cannot find a data slice or terminator slice on CD %d",
                     g_current_media_number);
@@ -1177 +1177 @@
                     media_descriptor_string(bkpinfo->backup_media_type),
                     g_current_media_number, sliceno);
-            log_msg(2, tmp);
+            mr_msg(2, tmp);
             sprintf(tmp, "Restoring from %s #%d",
                     media_descriptor_string(bkpinfo->backup_media_type),
@@ -1188 +1188 @@
                    slice_fname(bigfileno, sliceno, ARCHIVES_PATH, ""));
             if (does_file_exist(tmp) && length_of_file(tmp) == 0) {
-                log_msg(2,
+                mr_msg(2,
                         "End of bigfile # %ld (slice %ld is the terminator)",
                         bigfileno + 1, sliceno);
@@ -1235 +1235 @@
                     media_descriptor_string(bkpinfo->backup_media_type),
                     g_current_media_number, bigfileno + 1, sliceno);
-            log_msg(2, tmp);
+            mr_msg(2, tmp);
 
             if (!g_text_mode) {
@@ -1253 +1253 @@
                     sprintf(sz_msg + strlen(sz_msg),
                             "; written %ld to fout", siz);
-//        log_msg(2. sz_msg);
+//        mr_msg(2. sz_msg);
                 }
             }
@@ -1274 +1274 @@
 
     if (use_ntfsprog_hack) {
-        log_msg(3, "Waiting for ntfsclone to finish");
+        mr_msg(3, "Waiting for ntfsclone to finish");
         sprintf(tmp,
                 " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
@@ -1370 +1370 @@
     if (use_ntfsprog == BLK_START_A_PIHBIGGIE) {
         use_ntfsprog = 1;
-        log_msg(1, "%s --- pih=YES", orig_bf_fname);
+        mr_msg(1, "%s --- pih=YES", orig_bf_fname);
     } else if (use_ntfsprog == BLK_START_A_NORMBIGGIE) {
         use_ntfsprog = 0;
-        log_msg(1, "%s --- pih=NO", orig_bf_fname);
+        mr_msg(1, "%s --- pih=NO", orig_bf_fname);
     } else {
         use_ntfsprog = 0;
-        log_msg(1, "%s --- pih=NO (weird marker though)", orig_bf_fname);
+        mr_msg(1, "%s --- pih=NO (weird marker though)", orig_bf_fname);
     }
 
@@ -1389 +1389 @@
         if (!node) {
             dummy_restore = TRUE;
-            log_msg(1,
+            mr_msg(1,
                     "Skipping big file %ld (%s) - not in biggielist subset",
                     biggiefile_number + 1, orig_bf_fname);
@@ -1395 +1395 @@
         } else if (!(node->selected)) {
             dummy_restore = TRUE;
-            log_msg(1, "Skipping %s (name isn't in biggielist subset)",
+            mr_msg(1, "Skipping %s (name isn't in biggielist subset)",
                     orig_bf_fname);
             pathname_of_last_file_restored[0] = '\0';
@@ -1403 +1403 @@
     if (use_ntfsprog) {
         if (strncmp(orig_bf_fname, "/dev/", 5)) {
-            log_msg(1,
+            mr_msg(1,
                     "I was in error when I set use_ntfsprog to TRUE.");
-            log_msg(1, "%s isn't even in /dev", orig_bf_fname);
+            mr_msg(1, "%s isn't even in /dev", orig_bf_fname);
             use_ntfsprog = FALSE;
         }
@@ -1414 +1414 @@
         strcpy(outfile_fname, orig_bf_fname);
         use_ntfsprog_hack = TRUE;
-        log_msg(2,
+        mr_msg(2,
                 "Calling ntfsclone in background because %s is a /dev entry",
                 outfile_fname);
@@ -1428 +1428 @@
             fatal_error("Fork failure");
         case 0:
-            log_msg(3,
+            mr_msg(3,
                     "CHILD - fip - calling feed_outfrom_ntfsprog(%s, %s)",
                     outfile_fname, ntfsprog_fifo);
             res =
                 feed_outfrom_ntfsprog(outfile_fname, ntfsprog_fifo);
-//          log_msg(3, "CHILD - fip - exiting");
+//          mr_msg(3, "CHILD - fip - exiting");
             exit(res);
             break;
         default:
-            log_msg(3,
+            mr_msg(3,
                     "feed_into_ntfsprog() called in background --- pid=%ld",
                     (long int) (pid));
@@ -1459 +1459 @@
         sprintf(tmp, "Reassembling big file %ld (%s)",
                 biggiefile_number + 1, orig_bf_fname);
-        log_msg(2, tmp);
+        mr_msg(2, tmp);
     }
 
@@ -1473 +1473 @@
     }
     sprintf(tmp, "Pipe command = '%s'", command);
-    log_msg(3, tmp);
+    mr_msg(3, tmp);
 
     /* restore biggiefile, one slice at a time */
@@ -1487 +1487 @@
         sprintf(tmp, "Working on file #%ld, slice #%ld    ",
                 biggiefile_number + 1, current_slice_number);
-        log_msg(2, tmp);
+        mr_msg(2, tmp);
         if (!g_text_mode) {
             newtDrawRootText(0, g_noof_rows - 2, tmp);
@@ -1505 +1505 @@
                     ((void *) &biggiestruct, 1, sizeof(biggiestruct),
                      fin) < sizeof(biggiestruct)) {
-                    log_msg(2,
+                    mr_msg(2,
                             "Warning - unable to get biggiestruct of bigfile #%d",
                             biggiefile_number + 1);
@@ -1525 +1525 @@
     paranoid_pclose(pout);
 
-    log_msg(1, "pathname_of_last_file_restored is now %s",
+    mr_msg(1, "pathname_of_last_file_restored is now %s",
             pathname_of_last_file_restored);
 
     if (use_ntfsprog_hack) {
-        log_msg(3, "Waiting for ntfsclone to finish");
+        mr_msg(3, "Waiting for ntfsclone to finish");
         sprintf(tmp,
                 " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
@@ -1535 +1535 @@
             sleep(1);
         }
-        log_msg(3, "OK, ntfsclone has really finished");
-    }
-
-    log_msg(3, "biggiestruct.filename = %s", biggiestruct.filename);
-    log_msg(3, "biggiestruct.checksum = %s", biggiestruct.checksum);
+        mr_msg(3, "OK, ntfsclone has really finished");
+    }
+
+    mr_msg(3, "biggiestruct.filename = %s", biggiestruct.filename);
+    mr_msg(3, "biggiestruct.checksum = %s", biggiestruct.checksum);
     if (strcmp(outfile_fname, "/dev/null")) {
         chmod(outfile_fname, biggiestruct.properties.st_mode);
@@ -1609 +1609 @@
     malloc_string(acl_fname);
 
-    log_msg(5, "Entering");
+    mr_msg(5, "Entering");
     filelist_subset_fname[0] = '\0';
     use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
@@ -1621 +1621 @@
             current_tarball_number);
     if (length_of_file(filelist_name) <= 2) {
-        log_msg(2, "There are _zero_ files in filelist '%s'",
+        mr_msg(2, "There are _zero_ files in filelist '%s'",
                 filelist_name);
-        log_msg(2,
+        mr_msg(2,
                 "This is a bit silly (ask dev-team to fix mondo_makefilelist, please)");
-        log_msg(2,
+        mr_msg(2,
                 "but it's non-critical. It's cosmetic. Don't worry about it.");
         retval = 0;
@@ -1632 +1632 @@
     if (count_lines_in_file(filelist_name) <= 0
         || length_of_file(tarball_fname) <= 0) {
-        log_msg(3, "length_of_file(%s) = %llu", tarball_fname,
+        mr_msg(3, "length_of_file(%s) = %llu", tarball_fname,
                 length_of_file(tarball_fname));
         sprintf(tmp, "Unable to restore fileset #%ld (CD I/O error)",
@@ -1650 +1650 @@
             <= 0) {
             sprintf(tmp, "Skipping fileset %ld", current_tarball_number);
-            log_msg(1, tmp);
+            mr_msg(1, tmp);
         } else {
-            log_msg(3, "Saved fileset %ld's subset to %s",
+            mr_msg(3, "Saved fileset %ld's subset to %s",
                     current_tarball_number, filelist_subset_fname);
         }
@@ -1722 +1722 @@
         sprintf(command + strlen(command), " 2>> %s >> %s", temp_log,
                 temp_log);
-        log_msg(1, "command = '%s'", command);
+        mr_msg(1, "command = '%s'", command);
         unlink(temp_log);
         res = system(command);
@@ -1729 +1729 @@
             if (p) {
                 p[0] = p[1] = p[2] = p[3] = ' ';
-                log_msg(1, "new command = '%s'", command);
+                mr_msg(1, "new command = '%s'", command);
                 res = system(command);
             }
@@ -1738 +1738 @@
 
         if (g_getfattr) {
-            log_msg(1, "Setting fattr list %s", xattr_fname);
+            mr_msg(1, "Setting fattr list %s", xattr_fname);
             if (length_of_file(xattr_fname) > 0) {
                 res = set_fattr_list(filelist_subset_fname, xattr_fname);
@@ -1745 +1745 @@
                         ("Errors occurred while setting extended attributes");
                 } else {
-                    log_msg(1, "I set xattr OK");
+                    mr_msg(1, "I set xattr OK");
                 }
                 retval += res;
@@ -1751 +1751 @@
         }
         if (g_getfacl) {
-            log_msg(1, "Setting acl list %s", acl_fname);
+            mr_msg(1, "Setting acl list %s", acl_fname);
             if (length_of_file(acl_fname) > 0) {
                 res = set_acl_list(filelist_subset_fname, acl_fname);
@@ -1758 +1758 @@
                         ("Errors occurred while setting access control lists");
                 } else {
-                    log_msg(1, "I set ACL OK");
+                    mr_msg(1, "I set ACL OK");
                 }
                 retval += res;
@@ -1766 +1766 @@
             sprintf(command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
             system(command);
-            log_msg(2, "Errors occurred while processing fileset #%d",
+            mr_msg(2, "Errors occurred while processing fileset #%d",
                     current_tarball_number);
         } else {
-            log_msg(2, "Fileset #%d processed OK", current_tarball_number);
+            mr_msg(2, "Fileset #%d processed OK", current_tarball_number);
         }
     }
@@ -1790 +1790 @@
     mr_free(xattr_fname);
     mr_free(acl_fname);
-    log_msg(5, "Leaving");
+    mr_msg(5, "Leaving");
     return (retval);
 }
@@ -1852 +1852 @@
             media_descriptor_string(bkpinfo->backup_media_type),
             g_current_media_number);
-    log_msg(2, tmp);
+    mr_msg(2, tmp);
     run_program_and_log_output("mkdir -p " MNT_RESTORING "/tmp", FALSE);
 
@@ -1873 +1873 @@
     }
     if (res) {
-        log_msg(1, "Warning - error reading afioball from tape");
+        mr_msg(1, "Warning - error reading afioball from tape");
     }
     if (bkpinfo->compression_level == 0) {
@@ -1900 +1900 @@
         sprintf(command + strlen(command), " > %s 2>> %s", filelist_fname,
                 MONDO_LOGFILE);
-        log_msg(1, "command = %s", command);
+        mr_msg(1, "command = %s", command);
         if (system(command)) {
-            log_msg(4, "Warning - error occurred while retrieving TOC");
+            mr_msg(4, "Warning - error occurred while retrieving TOC");
         }
         if ((matches =
@@ -1910 +1910 @@
             <= 0 || length_of_file(filelist_subset_fname) < 2) {
             if (length_of_file(filelist_subset_fname) < 2) {
-                log_msg(1, "No matches found in fileset %ld",
+                mr_msg(1, "No matches found in fileset %ld",
                         current_tarball_number);
             }
             sprintf(tmp, "Skipping fileset %ld", current_tarball_number);
-            log_msg(2, tmp);
+            mr_msg(2, tmp);
             restore_this_fileset = FALSE;
         } else {
-            log_msg(5, "%ld matches. Saved fileset %ld's subset to %s",
+            mr_msg(5, "%ld matches. Saved fileset %ld's subset to %s",
                     matches, current_tarball_number,
                     filelist_subset_fname);
@@ -1946 +1946 @@
 // Call if IF there are files to restore (selectively/unconditionally)
     if (restore_this_fileset) {
-        log_msg(1, "Calling command='%s'", command);
+        mr_msg(1, "Calling command='%s'", command);
         paranoid_system(command);
 
@@ -1953 +1953 @@
             res = set_fattr_list(filelist_subset_fname, xattr_fname);
             if (res) {
-                log_msg(1, "Errors occurred while setting xattr");
+                mr_msg(1, "Errors occurred while setting xattr");
             } else {
-                log_msg(1, "I set xattr OK");
+                mr_msg(1, "I set xattr OK");
             }
             retval += res;
@@ -1964 +1964 @@
             res = set_acl_list(filelist_subset_fname, acl_fname);
             if (res) {
-                log_msg(1, "Errors occurred while setting ACL");
+                mr_msg(1, "Errors occurred while setting ACL");
             } else {
-                log_msg(1, "I set ACL OK");
+                mr_msg(1, "I set ACL OK");
             }
             retval += res;
@@ -1972 +1972 @@
 
     } else {
-        log_msg(1, "NOT CALLING '%s'", command);
+        mr_msg(1, "NOT CALLING '%s'", command);
     }
 
@@ -2034 +2034 @@
             "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
     if (!(fbw = fopen(biggies_whose_EXATs_we_should_set, "w"))) {
-        log_msg(1, "Warning - cannot openout %s",
+        mr_msg(1, "Warning - cannot openout %s",
                 biggies_whose_EXATs_we_should_set);
     }
@@ -2043 +2043 @@
     mvaddstr_and_log_it(g_currentY, 0, tmp);
     if (length_of_file(BIGGIELIST) < 6) {
-        log_msg(1, "OK, no biggielist; not restoring biggiefiles");
+        mr_msg(1, "OK, no biggielist; not restoring biggiefiles");
         return (0);
     }
     noof_biggiefiles = count_lines_in_file(BIGGIELIST);
     if (noof_biggiefiles <= 0) {
-        log_msg(2,
+        mr_msg(2,
                 "OK, no biggiefiles in biggielist; not restoring biggiefiles");
         return (0);
@@ -2054 +2054 @@
     sprintf(tmp, "OK, there are %ld biggiefiles in the archives",
             noof_biggiefiles);
-    log_msg(2, tmp);
+    mr_msg(2, tmp);
 
     open_progress_form("Reassembling large files",
@@ -2061 +2061 @@
                        "", total_slices);
     for (bigfileno = 0, finished = FALSE; !finished;) {
-        log_msg(2, "Thinking about restoring bigfile %ld", bigfileno + 1);
+        mr_msg(2, "Thinking about restoring bigfile %ld", bigfileno + 1);
         if (!does_file_exist(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""))) {
-            log_msg(3,
+            mr_msg(3,
                     "...but its first slice isn't on this CD. Perhaps this was a selective restore?");
-            log_msg(3, "Cannot find bigfile #%ld 's first slice on %s #%d",
+            mr_msg(3, "Cannot find bigfile #%ld 's first slice on %s #%d",
                     bigfileno + 1,
                     media_descriptor_string(bkpinfo->backup_media_type),
                     g_current_media_number);
-            log_msg(3, "Slicename would have been %s",
+            mr_msg(3, "Slicename would have been %s",
                     slice_fname(bigfileno + 1, 0, ARCHIVES_PATH, ""));
             // I'm not positive 'just_changed_cds' is even necessary...
             if (just_changed_cds) {
                 just_changed_cds = FALSE;
-                log_msg(3,
+                mr_msg(3,
                         "I'll continue to scan this CD for bigfiles to be restored.");
             } else if (does_file_exist(MNT_CDROM "/archives/NOT-THE-LAST")) {
@@ -2086 +2086 @@
                 just_changed_cds = TRUE;
             } else {
-                log_msg(2, "There was no bigfile #%ld. That's OK.",
+                mr_msg(2, "There was no bigfile #%ld. That's OK.",
                         bigfileno + 1);
-                log_msg(2, "I'm going to stop restoring bigfiles now.");
+                mr_msg(2, "I'm going to stop restoring bigfiles now.");
                 finished = TRUE;
             }
@@ -2180 +2180 @@
 
     mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
-    log_msg(2,
+    mr_msg(2,
             "Insisting on 1st CD, so that I can have a look at LAST-FILELIST-NUMBER");
     if (g_current_media_number != 1) {
-        log_msg(3, "OK, that's jacked up.");
+        mr_msg(3, "OK, that's jacked up.");
         g_current_media_number = 1;
     }
@@ -2244 +2244 @@
                     media_descriptor_string(bkpinfo->backup_media_type),
                     g_current_media_number);
-//    log_msg(3, "progress_str = %s", progress_str);
+//    mr_msg(3, "progress_str = %s", progress_str);
             for (res = 999, attempts = 0; attempts < 3 && res != 0;
                  attempts++) {
@@ -2350 +2350 @@
             "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
     if (!(fbw = fopen(biggies_whose_EXATs_we_should_set, "w"))) {
-        log_msg(1, "Warning - cannot openout %s",
+        mr_msg(1, "Warning - cannot openout %s",
                 biggies_whose_EXATs_we_should_set);
     }
@@ -2366 +2366 @@
     sprintf(tmp, "OK, there are %ld biggiefiles in the archives",
             noof_biggiefiles);
-    log_msg(2, tmp);
+    mr_msg(2, tmp);
     open_progress_form("Reassembling large files",
                        "I am now reassembling all the large files.",
@@ -2398 +2398 @@
                                                filelist, ctrl_chr,
                                                pathname_of_last_biggie_restored);
-        log_msg(1, "I believe I have restored %s",
+        mr_msg(1, "I believe I have restored %s",
                 pathname_of_last_biggie_restored);
         if (fbw && pathname_of_last_biggie_restored[0]) {
@@ -2416 +2416 @@
                 noof_biggiefiles, current_bigfile_number);
     }
-    log_msg(1, tmp);
+    mr_msg(1, tmp);
 
     if (fbw) {
@@ -2424 +2424 @@
             if (g_getfattr) {
                 if (length_of_file(xattr_fname) > 0) {
-                    log_msg(1, "set_fattr_List(%s,%s)",
+                    mr_msg(1, "set_fattr_List(%s,%s)",
                         biggies_whose_EXATs_we_should_set, xattr_fname);
                     set_fattr_list(biggies_whose_EXATs_we_should_set,
@@ -2432 +2432 @@
             if (g_getfacl) {
                 if (length_of_file(acl_fname) > 0) {
-                    log_msg(1, "set_acl_list(%s,%s)",
+                    mr_msg(1, "set_acl_list(%s,%s)",
                             biggies_whose_EXATs_we_should_set, acl_fname);
                     set_acl_list(biggies_whose_EXATs_we_should_set, acl_fname);
@@ -2523 +2523 @@
                        progress_str, max_val);
 
-    log_msg(3, "hey");
+    mr_msg(3, "hey");
 
     res = read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
     if (res) {
-        log_msg(2, "Warning - error reading afioball from tape");
+        mr_msg(2, "Warning - error reading afioball from tape");
     }
     retval += res;
@@ -2533 +2533 @@
         wrong_marker(BLK_START_AFIOBALLS, ctrl_chr);
     }
-    log_msg(2, "ho");
+    mr_msg(2, "ho");
     res = read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
     while (ctrl_chr != BLK_STOP_AFIOBALLS) {
@@ -2592 +2592 @@
         }
     }                           // next
-    log_msg(1, "All done with afioballs");
+    mr_msg(1, "All done with afioballs");
     close_progress_form();
     if (retval) {
@@ -2636 +2636 @@
     malloc_string(newpath);
     malloc_string(tmp);
-    log_msg(2, "restore_everything() --- starting");
+    mr_msg(2, "restore_everything() --- starting");
     g_current_media_number = 1;
     getcwd(cwd, MAX_STR_LEN - 1);
     sprintf(tmp, "mkdir -p %s", bkpinfo->restore_path);
     run_program_and_log_output(tmp, FALSE);
-    log_msg(1, "Changing dir to %s", bkpinfo->restore_path);
+    mr_msg(1, "Changing dir to %s", bkpinfo->restore_path);
     chdir(bkpinfo->restore_path);
     getcwd(newpath, MAX_STR_LEN - 1);
-    log_msg(1, "path is now %s", newpath);
-    log_msg(1, "restoring everything");
+    mr_msg(1, "path is now %s", newpath);
+    mr_msg(1, "restoring everything");
     if (!find_home_of_exe("petris") && !g_text_mode) {
         newtDrawRootText(0, g_noof_rows - 2,
@@ -2682 +2682 @@
     }
     if (length_of_file("/etc/raidtab") > 0) {
-        log_msg(2, "Copying local raidtab to restored filesystem");
+        mr_msg(2, "Copying local raidtab to restored filesystem");
         run_program_and_log_output("cp -f /etc/raidtab " MNT_RESTORING
                                    "/etc/raidtab", FALSE);
     }
     kill_petris();
-    log_msg(2, "restore_everything() --- leaving");
+    mr_msg(2, "restore_everything() --- leaving");
     mr_free(cwd);
     mr_free(newpath);
@@ -2732 +2732 @@
     sprintf(tmp, "restore_here = '%s'", restore_here);
 
-    log_msg(2, tmp);
-
-    log_msg(2, "restore_live_from_monitas_server() - starting");
+    mr_msg(2, tmp);
+
+    mr_msg(2, "restore_live_from_monitas_server() - starting");
     unlink("/tmp/mountlist.txt");
     unlink("/tmp/filelist.full");
@@ -2743 +2743 @@
         strcpy(bkpinfo->restore_path, restore_here);
     }
-    log_msg(3, "FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI");
+    mr_msg(3, "FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI");
     sprintf(tmp, "FYI - data will be restored to %s",
             bkpinfo->restore_path);
-    log_msg(3, tmp);
-    log_msg(3, "FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI");
+    mr_msg(3, tmp);
+    mr_msg(3, "FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI FYI");
     sprintf(datadisks_fname, "/tmp/mondorestore.datadisks.%d",
             (int) (random() % 32768));
@@ -2798 +2798 @@
             restore_this_directory, g_biggielist_txt, g_biggielist_txt);
     if (system(command)) {
-        log_msg(1,
+        mr_msg(1,
                 "Error(s) occurred while processing biggielist and wildcard");
     }
@@ -2806 +2806 @@
     retval += restore_everything(bkpinfo, filelist);
     free_filelist(filelist);
-    log_msg(2, "--------End of restore_live_from_monitas_server--------");
+    mr_msg(2, "--------End of restore_live_from_monitas_server--------");
     return (retval);
 }
@@ -2828 +2828 @@
 void welcome_to_mondorestore()
 {
-    log_msg(0, "-------------- Mondo Restore v%s -------------", PACKAGE_VERSION);
-    log_msg(0,
+    mr_msg(0, "-------------- Mondo Restore v%s -------------", PACKAGE_VERSION);
+    mr_msg(0,
             "DON'T PANIC! Mondorestore logs almost everything, so please ");
-    log_msg(0,
+    mr_msg(0,
             "don't break out in a cold sweat just because you see a few  ");
-    log_msg(0,
+    mr_msg(0,
             "error messages in the log. Read them; analyze them; see if  ");
-    log_msg(0,
+    mr_msg(0,
             "they are significant; above all, verify your backups! Please");
-    log_msg(0,
+    mr_msg(0,
             "attach a compressed copy of this log to any e-mail you send ");
-    log_msg(0,
+    mr_msg(0,
             "to the Mondo mailing list when you are seeking technical    ");
-    log_msg(0,
+    mr_msg(0,
             "support. Without it, we can't help you.            - DevTeam");
-    log_msg(0,
+    mr_msg(0,
             "------------------------------------------------------------");
-    log_msg(0,
+    mr_msg(0,
             "BTW, despite (or perhaps because of) the wealth of messages,");
-    log_msg(0,
+    mr_msg(0,
             "some users are inclined to stop reading this log.  If Mondo ");
-    log_msg(0,
+    mr_msg(0,
             "stopped for some reason, chances are it's detailed here.    ");
-    log_msg(0,
+    mr_msg(0,
             "More than likely there's a message at the very end of this  ");
-    log_msg(0,
+    mr_msg(0,
             "log that will tell you what is wrong.  Please read it!      ");
-    log_msg(0,
+    mr_msg(0,
             "------------------------------------------------------------");
 }
@@ -2906 +2906 @@
     {
         g_text_mode = TRUE;
-        log_msg(1, "TEXTONLY MODE");
+        mr_msg(1, "TEXTONLY MODE");
     } else {
         g_text_mode = FALSE;
@@ -2941 +2941 @@
     g_kernel_version = get_kernel_version();
 
-    log_msg(1, "FYI - g_mountlist_fname = %s", g_mountlist_fname);
+    mr_msg(1, "FYI - g_mountlist_fname = %s", g_mountlist_fname);
     if (strlen(g_mountlist_fname) < 3) {
         fatal_error
@@ -2951 +2951 @@
     sprintf(tmp, "%s.orig", g_mountlist_fname);
     if (!does_file_exist(g_mountlist_fname)) {
-        log_msg(2,
+        mr_msg(2,
                 "%ld: Warning - g_mountlist_fname (%s) does not exist yet",
                 __LINE__, g_mountlist_fname);
@@ -2978 +2978 @@
     welcome_to_mondorestore();
     if (bkpinfo->disaster_recovery) {
-        log_msg(1, "I am in disaster recovery mode");
+        mr_msg(1, "I am in disaster recovery mode");
     } else {
-        log_msg(1, "I am in normal, live mode");
+        mr_msg(1, "I am in normal, live mode");
     }
 
@@ -3061 +3061 @@
 
     if (argc == 5 && strcmp(argv[1], "--copy") == 0) {
-        log_msg(1, "SCORE");
+        mr_msg(1, "SCORE");
         g_loglevel = 10;
         if (strstr(argv[2], "save")) {
-            log_msg(1, "Saving from %s to %s", argv[3], argv[4]);
+            mr_msg(1, "Saving from %s to %s", argv[3], argv[4]);
             fin = fopen(argv[3], "r");
             fout = fopen(argv[4], "w");
@@ -3116 +3116 @@
 //    return(1);
         }
-        log_msg(1, "I am in normal, live mode.");
-        log_msg(2, "FYI, MOUNTLIST_FNAME = %s", g_mountlist_fname);
+        mr_msg(1, "I am in normal, live mode.");
+        mr_msg(2, "FYI, MOUNTLIST_FNAME = %s", g_mountlist_fname);
         mount_boot_if_necessary();  /* for Gentoo users */
-        log_msg(2, "Still here.");
+        mr_msg(2, "Still here.");
         if (argc > 1 && strcmp(argv[argc - 1], "--live-from-cd") == 0) {
             g_restoring_live_from_cd = TRUE;
@@ -3129 +3129 @@
                                                  argv[3], argv[4]);
         } else {
-            log_msg(2, "Calling restore_to_live_filesystem()");
+            mr_msg(2, "Calling restore_to_live_filesystem()");
             retval = restore_to_live_filesystem(bkpinfo);
         }
-        log_msg(2, "Still here. Yay.");
+        mr_msg(2, "Still here. Yay.");
         if (strlen(bkpinfo->tmpdir) > 0) {
             sprintf(tmp, "rm -Rf %s/*", bkpinfo->tmpdir);
@@ -3141 +3141 @@
     } else {
         /* Disaster recovery mode (must be) */
-        log_msg(1, "I must be in disaster recovery mode.");
-        log_msg(2, "FYI, MOUNTLIST_FNAME = %s ", g_mountlist_fname);
+        mr_msg(1, "I must be in disaster recovery mode.");
+        mr_msg(2, "FYI, MOUNTLIST_FNAME = %s ", g_mountlist_fname);
         if (argc == 3 && strcmp(argv[1], "--monitas-memorex") == 0) {
             log_to_screen("Uh, that hasn't been implemented yet.");
@@ -3161 +3161 @@
             if (bkpinfo->backup_media_type == nfs
                 && !is_this_device_mounted(bkpinfo->nfs_mount)) {
-                log_msg(1, "Mounting nfs dir");
+                mr_msg(1, "Mounting nfs dir");
                 sprintf(bkpinfo->isodir, "/tmp/isodir");
                 run_program_and_log_output("mkdir -p /tmp/isodir", 5);
@@ -3177 +3177 @@
 
 
-        log_msg(1, "Send in the clowns.");
+        mr_msg(1, "Send in the clowns.");
 
         if (argc == 2 && strcmp(argv[1], "--partition-only") == 0) {
-            log_msg(0, "Partitioning only.");
+            mr_msg(0, "Partitioning only.");
             load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
             strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
@@ -3189 +3189 @@
 
         if (argc == 2 && strcmp(argv[1], "--format-only") == 0) {
-            log_msg(0, "Formatting only.");
+            mr_msg(0, "Formatting only.");
             load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
             strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
@@ -3198 +3198 @@
 
         if (argc == 2 && strcmp(argv[1], "--stop-lvm-and-raid") == 0) {
-            log_msg(0, "Stopping LVM and RAID");
+            mr_msg(0, "Stopping LVM and RAID");
             load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
             strcpy(g_mountlist_fname, "/tmp/mountlist.txt");
@@ -3281 +3281 @@
 // g_I_have_just_nuked is set true by nuke_mode() just before it returns
     if (!system("which post-nuke > /dev/null 2> /dev/null")) {
-      log_msg(1, "post-nuke found; find out whether we should run it...");
+      mr_msg(1, "post-nuke found; find out whether we should run it...");
       if (g_I_have_just_nuked || does_file_exist("/POST-NUKE-ANYWAY")) {
         run_postnuke = TRUE;
-        log_msg(1, "Yes, will run post-nuke because in nuke mode or file /POST-NUKE-ANYWAY exists.");
+        mr_msg(1, "Yes, will run post-nuke because in nuke mode or file /POST-NUKE-ANYWAY exists.");
       } else if (ask_me_yes_or_no("post-nuke script found. Do you want to run it?")) {
         run_postnuke = TRUE;
-        log_msg(1, "Yes, will run post-nuke because user interactively asked for it.");
+        mr_msg(1, "Yes, will run post-nuke because user interactively asked for it.");
       } else {
         run_postnuke = FALSE;
-        log_msg(1, "No, will not run post-nuke.");
+        mr_msg(1, "No, will not run post-nuke.");
       }
     } else {
-      log_msg(1, "No post-nuke found.");
+      mr_msg(1, "No post-nuke found.");
     }
     if (run_postnuke) {
@@ -3301 +3301 @@
           ("Unable to re-mount partitions for post-nuke stuff");
       } else {
-        log_msg(1, "Re-mounted partitions for post-nuke stuff");
+        mr_msg(1, "Re-mounted partitions for post-nuke stuff");
         sprintf(tmp, "post-nuke %s %d", bkpinfo->restore_path,
             retval);
-        log_msg(2, "Calling '%s'", tmp);
+        mr_msg(2, "Calling '%s'", tmp);
         if ((res = run_program_and_log_output(tmp, 0))) {
           log_OS_error(tmp);
         }
-        log_msg(1, "post-nuke returned w/ res=%d", res);
+        mr_msg(1, "post-nuke returned w/ res=%d", res);
       }
       unmount_all_devices(mountlist);

branches/stable/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -78 +78 @@
             sprintf(tmp_ptr,
                     "No CD's left. No biggiefiles left. No prob, Bob.");
-            log_msg(2, tmp_ptr);
+            mr_msg(2, tmp_ptr);
             return (0);
         }
@@ -95 +95 @@
     strcpy(bigfile_fname_ptr, biggiestruct.filename);
 
-    log_msg(2, "biggiestruct.filename = %s", biggiestruct.filename);
-    log_msg(2, "biggiestruct.checksum = %s", biggiestruct.checksum);
+    mr_msg(2, "biggiestruct.filename = %s", biggiestruct.filename);
+    mr_msg(2, "biggiestruct.checksum = %s", biggiestruct.checksum);
 
     sprintf(tmp_ptr, "Comparing %s", bigfile_fname_ptr);
@@ -105 +105 @@
     }
     if (!checksum[0]) {
-        log_msg(2, "Warning - %s has no checksum", bigfile_fname_ptr);
+        mr_msg(2, "Warning - %s has no checksum", bigfile_fname_ptr);
     }
     if (!strncmp(bigfile_fname_ptr, "/dev/", 5)) {
@@ -114 +114 @@
                 MNT_RESTORING, bigfile_fname_ptr);
     }
-    log_msg(2, command_ptr);
+    mr_msg(2, command_ptr);
     paranoid_system
         ("cat /tmp/errors >> /tmp/mondo-restore.log 2> /dev/null");
@@ -123 +123 @@
     } else {
         if (!(fin = fopen("/tmp/md5sum.txt", "r"))) {
-            log_msg(2,
+            mr_msg(2,
                     "Unable to open /tmp/md5sum.txt; can't get live checksum");
             original_cksum[0] = '\0';
@@ -147 +147 @@
         retval++;
     }
-    log_msg(1, tmp_ptr);
+    mr_msg(1, tmp_ptr);
     if (retval) {
         if (!(fout = fopen("/tmp/changed.txt", "a"))) {
@@ -188 +188 @@
 
     assert(bkpinfo != NULL);
-    log_msg(1, "Comparing biggiefiles");
+    mr_msg(1, "Comparing biggiefiles");
 
     if (length_of_file(BIGGIELIST) < 6) {
-        log_msg(1,
+        mr_msg(1,
                 "OK, really teeny-tiny biggielist; not comparing biggiefiles");
         return (0);
@@ -197 +197 @@
     noof_biggiefiles = count_lines_in_file(BIGGIELIST);
     if (noof_biggiefiles <= 0) {
-        log_msg(1, "OK, no biggiefiles; not comparing biggiefiles");
+        mr_msg(1, "OK, no biggiefiles; not comparing biggiefiles");
         return (0);
     }
@@ -208 +208 @@
     for (bigfileno = 0; bigfileno < noof_biggiefiles; bigfileno++) {
         sprintf(tmp, "Comparing big file #%ld", bigfileno + 1);
-        log_msg(1, tmp);
+        mr_msg(1, tmp);
         update_progress_form(tmp);
         res = compare_a_biggiefile(bkpinfo, bigfileno);
@@ -341 +341 @@
                 "Differences found while processing fileset #%d       ",
                 current_tarball_number);
-        log_msg(1, tmp);
+        mr_msg(1, tmp);
     }
     unlink(logfile);
@@ -421 +421 @@
                        "/archives/slice* > /dev/null 2> /dev/null")
                 == 0) {
-                log_msg(2, "OK, I think I'm done with tarballs...");
+                mr_msg(2, "OK, I think I'm done with tarballs...");
                 break;
             }
-            log_msg(2, "OK, I think it's time for another CD...");
+            mr_msg(2, "OK, I think it's time for another CD...");
             g_current_media_number++;
             sprintf(progress_str, "Comparing with %s #%d ",
@@ -603 +603 @@
             log_to_screen(tmp);
 
-            log_msg(2, "calling popup_changelist_from_file()");
+            mr_msg(2, "calling popup_changelist_from_file()");
             popup_changelist_from_file("/tmp/changed.files");
-            log_msg(2, "Returning from popup_changelist_from_file()");
+            mr_msg(2, "Returning from popup_changelist_from_file()");
         }
     } else {
@@ -658 +658 @@
     if (length_of_file("/tmp/changed.txt") > 2
         && length_of_file("/tmp/changed.files") > 2) {
-        log_msg(0,
+        mr_msg(0,
                 "Type 'less /tmp/changed.files' to see which files don't match the archives");
-        log_msg(2, "Calling popup_changelist_from_file()");
+        mr_msg(2, "Calling popup_changelist_from_file()");
         popup_changelist_from_file("/tmp/changed.files");
-        log_msg(2, "Returned from popup_changelist_from_file()");
+        mr_msg(2, "Returned from popup_changelist_from_file()");
     }
 

branches/stable/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -1586 +1586 @@
            sizeof(struct raid_device_record));
     sprintf(title_of_editraidForm_window, "%s", raidrec->raid_device);
-    log_msg(2, "Opening newt window");
+    mr_msg(2, "Opening newt window");
     newtOpenWindow(20, 5, 40, 14, title_of_editraidForm_window);
     for (;;) {
-        log_msg(2, "Main loop");
+        mr_msg(2, "Main loop");
         sprintf(title_of_editraidForm_window, "Edit %s",
                 raidrec->raid_device);

branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -207 +207 @@
         || (!does_file_exist(output_mountlist_file)
             && does_file_exist(orig_fname))) {
-        log_msg(2, "Failed to extract %s and/or %s from ramdisk",
+        mr_msg(2, "Failed to extract %s and/or %s from ramdisk",
                 output_cfg_file, output_mountlist_file);
         retval = 1;
@@ -275 +275 @@
             "Checking to see if f=%s, file=%s, is in the list of biggiefiles",
             f, file);
-    log_msg(2, tmp);
+    mr_msg(2, tmp);
     sprintf(command, "grep -E '^%s$' %s", file, list_fname);
     res = run_program_and_log_output(command, FALSE);
@@ -324 +324 @@
         sprintf(command, "mkdir -p %s", bkpinfo->isodir);
         run_program_and_log_output(command, 5);
-        log_msg(2, "Setting isodir to %s", bkpinfo->isodir);
+        mr_msg(2, "Setting isodir to %s", bkpinfo->isodir);
     }
 
@@ -349 +349 @@
                 "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?",
                 mount_isodir_command);
-        log_msg(1, tmp);
+        mr_msg(1, tmp);
         if (run_program_and_log_output(mount_isodir_command, FALSE)) {
             popup_and_OK
@@ -364 +364 @@
     sprintf(tmp, "%s #%d has been mounted via loopback mount",
             media_descriptor_string(bkpinfo->backup_media_type), i);
-    log_msg(1, tmp);
+    mr_msg(1, tmp);
     if (i < 0) {
         popup_and_OK
@@ -370 +370 @@
         retval = 1;
     }
-    log_msg(2, "%ld: bkpinfo->isodir is now %s", __LINE__,
+    mr_msg(2, "%ld: bkpinfo->isodir is now %s", __LINE__,
             bkpinfo->isodir);
     mr_free(mount_isodir_command);
@@ -501 +501 @@
     for (lino = 0; lino < mountlist->entries; lino++) {
         if (!strcmp(mountlist->el[lino].device, "/proc")) {
-            log_msg(1,
+            mr_msg(1,
                     "Again with the /proc - why is this in your mountlist?");
         } else if (is_this_device_mounted(mountlist->el[lino].device)) {
@@ -591 +591 @@
     if (bkpinfo->backup_media_type == tape
         || bkpinfo->backup_media_type == udev) {
-        log_msg(8, "Tape/udev. Therefore, no need to mount CDROM.");
+        mr_msg(8, "Tape/udev. Therefore, no need to mount CDROM.");
         mr_free(mount_cmd);
         return 0;
@@ -597 +597 @@
 
     if (!run_program_and_log_output("mount | grep -F " MNT_CDROM, FALSE)) {
-        log_msg(2, "mount_cdrom() - CD already mounted. Fair enough.");
+        mr_msg(2, "mount_cdrom() - CD already mounted. Fair enough.");
         mr_free(mount_cmd);
         return (0);
@@ -603 +603 @@
 
     if (bkpinfo->backup_media_type == nfs) {
-        log_msg(2, "Mounting for NFS thingy");
-        log_msg(2, "isodir = %s", bkpinfo->isodir);
+        mr_msg(2, "Mounting for NFS thingy");
+        mr_msg(2, "isodir = %s", bkpinfo->isodir);
         if ((!bkpinfo->isodir[0] || !strcmp(bkpinfo->isodir, "/"))
             && am_I_in_disaster_recovery_mode()) {
             strcpy(bkpinfo->isodir, "/tmp/isodir");
-            log_msg(1, "isodir is being set to %s", bkpinfo->isodir);
+            mr_msg(1, "isodir is being set to %s", bkpinfo->isodir);
         }
 #ifdef __FreeBSD__
@@ -663 +663 @@
 
     }
-    log_msg(2, "(mount_cdrom) --- command = %s", mount_cmd);
+    mr_msg(2, "(mount_cdrom) --- command = %s", mount_cmd);
     for (i = 0; i < 2; i++) {
         res = run_program_and_log_output(mount_cmd, FALSE);
@@ -669 +669 @@
             break;
         } else {
-            log_msg(2, "Failed to mount CD-ROM drive.");
+            mr_msg(2, "Failed to mount CD-ROM drive.");
             sleep(5);
             run_program_and_log_output("sync", FALSE);
@@ -675 +675 @@
     }
     if (res) {
-        log_msg(2, "Failed, despite %d attempts", i);
-    } else {
-        log_msg(2, "Mounted CD-ROM drive OK");
+        mr_msg(2, "Failed, despite %d attempts", i);
+    } else {
+        mr_msg(2, "Mounted CD-ROM drive OK");
     }
     mr_free(mount_cmd);
@@ -718 +718 @@
     if (!strcmp(mpt, "/1")) {
         strcpy(mountpoint, "/");
-        log_msg(3, "Mommm! SME is being a dildo!");
+        mr_msg(3, "Mommm! SME is being a dildo!");
     } else {
         strcpy(mountpoint, mpt);
@@ -730 +730 @@
     }
     sprintf(tmp, "Mounting device %s   ", device);
-    log_msg(1, tmp);
+    mr_msg(1, tmp);
     if (writeable) {
         strcpy(additional_parameters, "-o rw");
@@ -755 +755 @@
         sprintf(command, "mount -t %s %s %s %s 2>> %s", format, device,
                 additional_parameters, mountdir, MONDO_LOGFILE);
-        log_msg(2, "command='%s'", command);
+        mr_msg(2, "command='%s'", command);
     }
     res = run_program_and_log_output(command, TRUE);
     if (res && (strstr(command, "xattr") || strstr(command, "acl"))) {
-        log_msg(1, "Re-trying without the fancy extra parameters");
+        mr_msg(1, "Re-trying without the fancy extra parameters");
         sprintf(command, "mount -t %s %s %s 2>> %s", format, device,
                 mountdir, MONDO_LOGFILE);
@@ -765 +765 @@
     }
     if (res) {
-        log_msg(1, "Unable to mount device %s (type %s) at %s", device,
+        mr_msg(1, "Unable to mount device %s (type %s) at %s", device,
                 format, mountdir);
-        log_msg(1, "command was '%s'", command);
+        mr_msg(1, "command was '%s'", command);
         if (!strcmp(mountpoint, "swap")) {
             log_to_screen(tmp);
         } else {
-            log_msg(2, "Retrying w/o the '-t' switch");
+            mr_msg(2, "Retrying w/o the '-t' switch");
             sprintf(command, "mount %s %s 2>> %s", device, mountdir,
                     MONDO_LOGFILE);
-            log_msg(2, "2nd command = '%s'", command);
+            mr_msg(2, "2nd command = '%s'", command);
             res = run_program_and_log_output(command, TRUE);
             if (res == 0) {
-                log_msg(1,
+                mr_msg(1,
                         "That's OK. I called mount w/o a filesystem type and it worked fine in the end.");
             } else {
@@ -785 +785 @@
     }
     if (res && !strcmp(mountpoint, "swap")) {
-        log_msg(2, "That's ok. It's just a swap partition.");
-        log_msg(2, "Non-fatal error. Returning 0.");
+        mr_msg(2, "That's ok. It's just a swap partition.");
+        mr_msg(2, "Non-fatal error. Returning 0.");
         res = 0;
     }
@@ -898 +898 @@
                 /* Check to see if CD is already mounted before mounting it... */
                 if (!is_this_device_mounted("/dev/cdrom")) {
-                    log_msg(2,
+                    mr_msg(2,
                             "NB: CDROM device not mounted, mounting...");
                     run_program_and_log_output("mount /dev/cdrom "
@@ -959 +959 @@
             sprintf(tmp, "Backup medium is TAPE --- dev=%s",
                     bkpinfo->media_device);
-            log_msg(2, tmp);
+            mr_msg(2, tmp);
         } else {
             strcpy(bkpinfo->media_device, "/dev/cdrom");    /* we don't really need this var */
             bkpinfo->media_size[0] = 1999 * 1024;   /* 650, probably, but we don't need this var anyway */
             bkpinfo->media_size[1] = 1999 * 1024;   /* 650, probably, but we don't need this var anyway */
-            log_msg(2, "Backup medium is CD-R[W]");
-        }
-    } else {
-        log_msg(2,
+            mr_msg(2, "Backup medium is CD-R[W]");
+        }
+    } else {
+        mr_msg(2,
                 "Not in Disaster Recovery Mode. No need to derive device name from config file.");
     }
@@ -974 +974 @@
     if (strstr(value, "yes")) {
         bkpinfo->use_star = TRUE;
-        log_msg(1, "Goody! ... bkpinfo->use_star is now true.");
+        mr_msg(1, "Goody! ... bkpinfo->use_star is now true.");
     }
 
@@ -980 +980 @@
     if (strstr(value, "yes")) {
         mr_asprintf(&g_getfacl,"setfacl");
-        log_msg(1, "We will restore ACLs");
+        mr_msg(1, "We will restore ACLs");
         if (! find_home_of_exe("setfacl")) {
-            log_msg(1, "Unable to restore ACLs as no setfacl found");
+            mr_msg(1, "Unable to restore ACLs as no setfacl found");
         }
     }
@@ -988 +988 @@
     if (strstr(value, "yes")) {
         mr_asprintf(&g_getfattr,"setfattr");
-        log_msg(1, "We will restore XATTRs");
+        mr_msg(1, "We will restore XATTRs");
         if (! find_home_of_exe("setfattr")) {
-            log_msg(1, "Unable to restore XATTRs as no setfattr found");
+            mr_msg(1, "Unable to restore XATTRs as no setfattr found");
         }
     }
@@ -996 +996 @@
     if (0 == read_cfg_var(cfg_file, "internal-tape-block-size", value)) {
         bkpinfo->internal_tape_block_size = atol(value);
-        log_msg(1, "Internal tape block size has been custom-set to %ld",
+        mr_msg(1, "Internal tape block size has been custom-set to %ld",
                 bkpinfo->internal_tape_block_size);
     } else {
         bkpinfo->internal_tape_block_size =
             DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
-        log_msg(1, "Internal tape block size = default (%ld)",
+        mr_msg(1, "Internal tape block size = default (%ld)",
                 DEFAULT_INTERNAL_TAPE_BLOCK_SIZE);
     }
@@ -1036 +1036 @@
         bkpinfo->differential = TRUE;
     }
-    log_msg(2, "differential var = '%s'", value);
+    mr_msg(2, "differential var = '%s'", value);
     if (bkpinfo->differential) {
-        log_msg(2, "THIS IS A DIFFERENTIAL BACKUP");
-    } else {
-        log_msg(2, "This is a regular (full) backup");
+        mr_msg(2, "THIS IS A DIFFERENTIAL BACKUP");
+    } else {
+        mr_msg(2, "This is a regular (full) backup");
     }
 
@@ -1049 +1049 @@
                ("cat /proc/cmdline"), "donteject")) {
         bkpinfo->please_dont_eject = TRUE;
-        log_msg(2, "Ok, I shan't eject when restoring! Groovy.");
+        mr_msg(2, "Ok, I shan't eject when restoring! Groovy.");
     }
 
     if (bkpinfo->backup_media_type == nfs) {
         if (!cfgf) {
-            log_msg(2, "nfs_mount remains %s", bkpinfo->nfs_mount);
-            log_msg(2, "nfs_remote_dir remains %s",
+            mr_msg(2, "nfs_mount remains %s", bkpinfo->nfs_mount);
+            mr_msg(2, "nfs_remote_dir remains %s",
                     bkpinfo->nfs_remote_dir);
-            log_msg(2,
+            mr_msg(2,
                     "...cos it wouldn't make sense to abandon the values that GOT ME to this config file in the first place");
         } else {
@@ -1064 +1064 @@
             read_cfg_var(g_mondo_cfg_file, "nfs-server-path",
                          bkpinfo->nfs_remote_dir);
-            log_msg(2, "nfs_mount is %s", bkpinfo->nfs_mount);
-            log_msg(2, "nfs_remote_dir is %s", bkpinfo->nfs_remote_dir);
+            mr_msg(2, "nfs_mount is %s", bkpinfo->nfs_mount);
+            mr_msg(2, "nfs_remote_dir is %s", bkpinfo->nfs_remote_dir);
         }
         if (strstr(call_program_and_get_last_line_of_output
@@ -1103 +1103 @@
         }
         read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
-        log_msg(2, "isodir=%s; iso-dev=%s", bkpinfo->isodir,
+        mr_msg(2, "isodir=%s; iso-dev=%s", bkpinfo->isodir,
                 g_isodir_device);
         if (bkpinfo->disaster_recovery) {
             if (is_this_device_mounted(g_isodir_device)) {
-                log_msg(2, "NB: isodir is already mounted");
+                mr_msg(2, "NB: isodir is already mounted");
                 /* Find out where it's mounted */
                 sprintf(command,
@@ -1123 +1123 @@
                 sprintf(tmp, "mount %s %s", g_isodir_device, iso_mnt);
                 if (run_program_and_log_output(tmp, 3)) {
-                    log_msg(1,
+                    mr_msg(1,
                             "Unable to mount isodir. Perhaps this is really a CD backup?");
                     bkpinfo->backup_media_type = cdr;
@@ -1132 +1132 @@
                             ("Unable to mount isodir. Failed to mount CD-ROM as well.");
                     } else {
-                        log_msg(1,
+                        mr_msg(1,
                                 "You backed up to disk, then burned some CDs.");
                     }
@@ -1147 +1147 @@
         if (g_restoring_live_from_cd) {
             if (bkpinfo->backup_media_type != media_specified_by_user) {
-                log_msg(2,
+                mr_msg(2,
                         "bkpinfo->backup_media_type != media_specified_by_user, so I'd better ask :)");
                 interactively_obtain_media_parameters_from_user(bkpinfo,
@@ -1206 +1206 @@
     if (does_file_exist(g_filelist_full)
         && does_file_exist(g_biggielist_txt)) {
-        log_msg(1, "%s exists", g_filelist_full);
-        log_msg(1, "%s exists", g_biggielist_txt);
-        log_msg(2,
+        mr_msg(1, "%s exists", g_filelist_full);
+        mr_msg(1, "%s exists", g_biggielist_txt);
+        mr_msg(2,
                 "Filelist and biggielist already recovered from media. Yay!");
     } else {
         getcwd(tmp, MAX_STR_LEN);
         chdir(bkpinfo->tmpdir);
-        log_msg(1, "chdir(%s)", bkpinfo->tmpdir);
+        mr_msg(1, "chdir(%s)", bkpinfo->tmpdir);
         log_to_screen("Extracting filelist and biggielist from media...");
         unlink("/tmp/filelist.full");
@@ -1226 +1226 @@
                     FILELIST_FULL_STUB,
                     "tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
-            log_msg(1, "tarcommand = %s", command);
+            mr_msg(1, "tarcommand = %s", command);
             run_program_and_log_output(command, 1);
         } else {
-            log_msg(2,
+            mr_msg(2,
                     "Calling insist_on_this_cd_number; bkpinfo->isodir=%s",
                     bkpinfo->isodir);
             insist_on_this_cd_number(bkpinfo, 1);
-            log_msg(2, "Back from iotcn");
+            mr_msg(2, "Back from iotcn");
             run_program_and_log_output("mount", 1);
             sprintf(command,
@@ -1243 +1243 @@
                     "tmp/i-want-my-lvm", MONDO_CFG_FILE_STUB);
 
-            log_msg(1, "tarcommand = %s", command);
+            mr_msg(1, "tarcommand = %s", command);
             run_program_and_log_output(command, 1);
 //    popup_and_OK("Press ENTER to continue");
@@ -1261 +1261 @@
         sprintf(command, "cp -f %s/%s %s", bkpinfo->tmpdir,
                 BIGGIELIST_TXT_STUB, g_biggielist_txt);
-        log_msg(1, "command = %s", command);
+        mr_msg(1, "command = %s", command);
         paranoid_system(command);
         sprintf(command, "ln -sf %s/%s %s", bkpinfo->tmpdir,
                 FILELIST_FULL_STUB, g_filelist_full);
-        log_msg(1, "command = %s", command);
+        mr_msg(1, "command = %s", command);
         paranoid_system(command);
     }
@@ -1282 +1282 @@
 
     if (!does_file_exist(g_biggielist_txt)) {
-        log_msg(1, "Warning - %s not found", g_biggielist_txt);
+        mr_msg(1, "Warning - %s not found", g_biggielist_txt);
     }
     if (!does_file_exist(g_filelist_full)) {
-        log_msg(1, "Warning - %s does not exist", g_filelist_full);
+        mr_msg(1, "Warning - %s does not exist", g_filelist_full);
     }
 //  popup_and_OK("Wonderful.");
 
-    log_msg(2, "Forking");
+    mr_msg(2, "Forking");
     pid = fork();
     switch (pid) {
@@ -1317 +1317 @@
     close_evalcall_form();
 
-    log_msg(3, "loading filelist");
+    mr_msg(3, "loading filelist");
     filelist = load_filelist(g_filelist_full);
-    log_msg(3, "deleting original filelist");
+    mr_msg(3, "deleting original filelist");
     unlink(g_filelist_full);
     if (g_text_mode) {
@@ -1334 +1334 @@
     }
     if (res) {
-        log_msg(2, "User hit 'cancel'. Freeing filelist and aborting.");
+        mr_msg(2, "User hit 'cancel'. Freeing filelist and aborting.");
         free_filelist(filelist);
         return (NULL);
@@ -1418 +1418 @@
     read_cfg_var(g_mondo_cfg_file, "bootloader.name", name);
     sprintf(tmp, "run_boot_loader: device='%s', name='%s'", device, name);
-    log_msg(2, tmp);
+    mr_msg(2, tmp);
     system("sync");
     if (!strcmp(name, "LILO")) {
@@ -1432 +1432 @@
 //      else
 //        {
-//    log_msg(1, "Not running run_grub(). Was a bad idea anyway.");
+//    mr_msg(1, "Not running run_grub(). Was a bad idea anyway.");
 //    res = 1;
 //  }
@@ -1448 +1448 @@
             res = run_program_and_log_output(tmp, 3);
         } else {
-            log_msg(1,
+            mr_msg(1,
                     "I'm not running any boot loader. You have a DD boot drive. It's already loaded up.");
         }
@@ -1497 +1497 @@
     }
     if (!find_home_of_exe(output)) {
-        log_msg(2, " (find_my_editor) --- warning - %s not found", output);
+        mr_msg(2, " (find_my_editor) --- warning - %s not found", output);
     }
     return (output);
@@ -1535 +1535 @@
 
     if (!run_program_and_log_output("which grub-MR", FALSE)) {
-        log_msg(1, "Yay! grub-MR found...");
+        mr_msg(1, "Yay! grub-MR found...");
         sprintf(command, "grub-MR %s /tmp/mountlist.txt", boot_device);
-        log_msg(1, "command = %s", command);
+        mr_msg(1, "command = %s", command);
     } else {
         sprintf(command, "chroot " MNT_RESTORING " grub-install %s",
                 boot_device);
-        log_msg(1, "WARNING - grub-MR not found; using grub-install");
+        mr_msg(1, "WARNING - grub-MR not found; using grub-install");
     }
     if (offer_to_run_stabgrub
@@ -1599 +1599 @@
         log_to_screen
             ("GRUB ran w/error(s). See /tmp/mondo-restore.log for more info.");
-        log_msg(1, "Type:-");
-        log_msg(1, "    mount-me");
-        log_msg(1, "    chroot " MNT_RESTORING);
-        log_msg(1, "    mount /boot");
-        log_msg(1, "    grub-install '(hd0)'");
-        log_msg(1, "    exit");
-        log_msg(1, "    unmount-me");
-        log_msg(1,
+        mr_msg(1, "Type:-");
+        mr_msg(1, "    mount-me");
+        mr_msg(1, "    chroot " MNT_RESTORING);
+        mr_msg(1, "    mount /boot");
+        mr_msg(1, "    grub-install '(hd0)'");
+        mr_msg(1, "    exit");
+        mr_msg(1, "    unmount-me");
+        mr_msg(1,
                 "If you're really stuck, please e-mail the mailing list.");
     } else {
@@ -1832 +1832 @@
     strcpy(boot_device, bd);
     sprintf(command, "raw-MR %s /tmp/mountlist.txt", boot_device);
-    log_msg(2, "run_raw_mbr() --- command='%s'", command);
+    mr_msg(2, "run_raw_mbr() --- command='%s'", command);
 
     if (offer_to_hack_scripts
@@ -2066 +2066 @@
 void termination_in_progress(int sig)
 {
-    log_msg(1, "Termination in progress");
+    mr_msg(1, "Termination in progress");
     usleep(1000);
     pthread_exit(0);
@@ -2113 +2113 @@
          i++) {
         sleep(1);
-        log_msg(2, "Waiting for buffer() to finish");
+        mr_msg(2, "Waiting for buffer() to finish");
     }
 
@@ -2120 +2120 @@
     if (run_program_and_log_output
         ("cp -f /tmp/mondo-restore.log " MNT_RESTORING "/tmp/", FALSE)) {
-        log_msg(1,
+        mr_msg(1,
                 "Error. Failed to copy log to PC's /tmp dir. (Mounted read-only?)");
     }
     if (run_program_and_log_output
         ("cp -f /tmp/mondo-restore.log " MNT_RESTORING "/root/", FALSE)) {
-        log_msg(1,
+        mr_msg(1,
                 "Error. Failed to copy log to PC's /root dir. (Mounted read-only?)");
     }
@@ -2145 +2145 @@
                 if (!strcmp(mountlist->el[lino].mountpoint, "/1")) {
                     sprintf(command, "umount %s/", MNT_RESTORING);
-                    log_msg(3,
+                    mr_msg(3,
                             "Well, I know a certain kitty-kitty who'll be sleeping with Mommy tonight...");
                 } else {
@@ -2152 +2152 @@
                 }
             }
-            log_msg(10, "The 'umount' command is '%s'", command);
+            mr_msg(10, "The 'umount' command is '%s'", command);
             res = run_program_and_log_output(command, 3);
         } else {
@@ -2164 +2164 @@
             log_to_screen(tmp);
         } else {
-            log_msg(2, tmp);
+            mr_msg(2, tmp);
         }
     }
@@ -2213 +2213 @@
             MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB,
             BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "tmp/i-want-my-lvm");
-    log_msg(2, "command = '%s'", command);
+    mr_msg(2, "command = '%s'", command);
     res = run_program_and_log_output(command, -1);
     if (res != 0 && does_file_exist(MONDO_CFG_FILE_STUB)) {
@@ -2258 +2258 @@
     malloc_string(command);
     malloc_string(tmp);
-    log_msg(2, "gcffa --- starting");
+    mr_msg(2, "gcffa --- starting");
     log_to_screen("I'm thinking...");
     sprintf(mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
@@ -2278 +2278 @@
     //   make_hole_for_file( cfg_file );
     //   make_hole_for_file( mountlist_file);
-    log_msg(2, "mountpt = %s; cfg_file=%s", mountpt, cfg_file);
+    mr_msg(2, "mountpt = %s; cfg_file=%s", mountpt, cfg_file);
 
     /* Floppy? */
@@ -2290 +2290 @@
             "(sleep 15; kill `ps | grep \"%s\" | cut -d' ' -f1` 2> /dev/null) &",
             command);
-    log_msg(1, "tmp = '%s'", tmp);
+    mr_msg(1, "tmp = '%s'", tmp);
     system(tmp);
     res = run_program_and_log_output(command, FALSE);
@@ -2301 +2301 @@
     } else {
         try_plan_B = TRUE;
-        log_msg(2,
+        mr_msg(2,
                 "Mounted floppy OK but I don't trust it because the archives might contain more up-to-date config file than the floppy does.");
 // NB: If busybox does not support 'mount -o loop' then Plan A WILL NOT WORK.
-        log_msg(2, "Processing floppy (plan A?)");
+        mr_msg(2, "Processing floppy (plan A?)");
         sprintf(ramdisk_fname, "%s/mindi.rdz", mountpt);
         if (!does_file_exist(ramdisk_fname)) {
@@ -2310 +2310 @@
         }
         if (!does_file_exist(ramdisk_fname)) {
-            log_msg(2,
+            mr_msg(2,
                     "Cannot find ramdisk file on mountpoint. Are you sure that's a boot disk in the drive?");
         }
         if (extract_config_file_from_ramdisk
             (bkpinfo, ramdisk_fname, cfg_file, mountlist_file)) {
-            log_msg(2,
+            mr_msg(2,
                     "Warning - failed to extract config file from ramdisk. I think this boot disk is mangled.");
         }
@@ -2323 +2323 @@
     }
     if (!does_file_exist(cfg_file)) {
-        log_msg(2, "gcffa --- we don't have cfg file yet.");
+        mr_msg(2, "gcffa --- we don't have cfg file yet.");
         if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
             try_plan_B = TRUE;
         } else {
-            log_msg(2, "gcffa --- calling mount_cdrom now :)");
+            mr_msg(2, "gcffa --- calling mount_cdrom now :)");
             if (!mount_cdrom(bkpinfo)) {
-                log_msg(2,
+                mr_msg(2,
                         "gcffa --- managed to mount CD; so, no need for Plan B");
                 try_plan_B = FALSE;
@@ -2341 +2341 @@
         }
         if (try_plan_B) {
-            log_msg(2, "gcffa --- OK, switching to Plan B");
+            mr_msg(2, "gcffa --- OK, switching to Plan B");
             chdir(bkpinfo->tmpdir);
             run_program_and_log_output("mkdir -p tmp", FALSE);
@@ -2347 +2347 @@
             if (strlen(bkpinfo->media_device) == 0) {
                 strcpy(bkpinfo->media_device, "/dev/st0");
-                log_msg(2, "media_device is blank; assuming %s");
+                mr_msg(2, "media_device is blank; assuming %s");
             }
             strcpy(tmp, bkpinfo->media_device);
@@ -2361 +2361 @@
                         if (extract_cfg_file_and_mountlist_from_tape_dev
                             (bkpinfo->media_device)) {
-                            log_msg(3,
+                            mr_msg(3,
                                     "I tried lots of devices but none worked.");
                             strcpy(bkpinfo->media_device, tmp);
@@ -2374 +2374 @@
             }
         } else {
-            log_msg(2,
+            mr_msg(2,
                     "gcffa --- looking at mounted CD for mindi-boot.2880.img");
             sprintf(command,
@@ -2381 +2381 @@
             sprintf(mounted_cfgf_path, "%s/%s", mountpt, cfg_file);
             if (!does_file_exist(mounted_cfgf_path)) {
-                log_msg(2,
+                mr_msg(2,
                         "gcffa --- Plan C, a.k.a. untarring some file from all.tar.gz");
                 sprintf(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, "tmp/i-want-my-lvm");  // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
@@ -2393 +2393 @@
     }
     if (does_file_exist(MONDO_CFG_FILE_STUB)) {
-        log_msg(1, "gcffa --- great! We've got the config file");
+        mr_msg(1, "gcffa --- great! We've got the config file");
         sprintf(tmp, "%s/%s",
                 call_program_and_get_last_line_of_output("pwd"),
@@ -2401 +2401 @@
         if (strcmp(tmp, cfg_file)
             && run_program_and_log_output(command, 1)) {
-            log_msg(1,
+            mr_msg(1,
                     "... but an error occurred when I tried to move it to %s",
                     cfg_file);
         } else {
-            log_msg(1, "... and I moved it successfully to %s", cfg_file);
+            mr_msg(1, "... and I moved it successfully to %s", cfg_file);
         }
         sprintf(command, "cp -f %s/%s %s",
@@ -2413 +2413 @@
         if (strcmp(tmp, cfg_file)
             && run_program_and_log_output(command, 1)) {
-            log_msg(1, "Failed to get mountlist");
+            mr_msg(1, "Failed to get mountlist");
         } else {
-            log_msg(1, "Got mountlist too");
+            mr_msg(1, "Got mountlist too");
             sprintf(command, "cp -f %s %s", mountlist_file,
                     g_mountlist_fname);
             if (run_program_and_log_output(command, 1)) {
-                log_msg(1, "Failed to copy mountlist to /tmp");
+                mr_msg(1, "Failed to copy mountlist to /tmp");
             } else {
-                log_msg(1, "Copied mountlist to /tmp as well OK");
+                mr_msg(1, "Copied mountlist to /tmp as well OK");
                 sprintf(command, "cp -f tmp/i-want-my-lvm /tmp/");
                 run_program_and_log_output(command, 1);
@@ -2427 +2427 @@
           if (!run_program_and_log_output(command, 5) && !does_file_exist("/tmp/i-want-my-lvm"))
             {
-          log_msg(1, "Warning. You want LVM but I don't have i-want-my-lvm. FIXME.");
+          mr_msg(1, "Warning. You want LVM but I don't have i-want-my-lvm. FIXME.");
         }
               else if (run_program_and_log_output(command,5) && does_file_exist("/tmp/i-want-my-lvm"))
                 {
-          log_msg(1, "Warning. You don't want LVM but i-want-my-lvm exists. I'll delete it. Cool.");
+          mr_msg(1, "Warning. You don't want LVM but i-want-my-lvm exists. I'll delete it. Cool.");
               do_my_funky_lvm_stuff(TRUE, FALSE); // ...after I stop any LVMs :)
           stop_raid_device("/dev/md0");
@@ -2440 +2440 @@
           else if (!run_program_and_log_output(command,5) && does_file_exist("/tmp/i-want-my-lvm"))
             {
-          log_msg(1, "You had better pray that i-want-my-lvm patches your mountlist. FIXME.");
+          mr_msg(1, "You had better pray that i-want-my-lvm patches your mountlist. FIXME.");
         }
 */
@@ -2449 +2449 @@
     if (!does_file_exist(cfg_file)) {
         iamhere(cfg_file);
-        log_msg(1, "%s not found", cfg_file);
+        mr_msg(1, "%s not found", cfg_file);
         log_to_screen
             ("Oh dear. Unable to recover configuration file from boot disk");
@@ -2529 +2529 @@
         if (parse_mdstat(raidlist, "/dev/")) {
             log_to_screen("Sorry, cannot read %s", MDSTAT_FILE);
-            log_msg(1,"Sorry, cannot read %s", MDSTAT_FILE);
+            mr_msg(1,"Sorry, cannot read %s", MDSTAT_FILE);
             return;
         }
@@ -2539 +2539 @@
                     continue;
                 }
-                log_msg(1,"Sync'ing %s (i=%d)", raidlist->el[i].raid_device, i);
+                mr_msg(1,"Sync'ing %s (i=%d)", raidlist->el[i].raid_device, i);
                 sprintf(screen_message, "Sync'ing %s",
                         raidlist->el[i].raid_device);
                 open_evalcall_form(screen_message);
                 while (raidlist->el[i].progress < wait_for_percentage) {
-                    log_msg(1,"Percentage sync'ed: %d", raidlist->el[i].progress);
+                    mr_msg(1,"Percentage sync'ed: %d", raidlist->el[i].progress);
                     update_evalcall_form(raidlist->el[i].progress);
                     sleep(2);