Changeset 1107 in MondoRescue for branches/stable/mondo/src/common/libmondo-tools.c

Timestamp:

Feb 8, 2007, 12:09:34 AM (17 years ago)

Author:

Bruno Cornec

Message:

log_msg => mr_msg for common files

File:

• branches/stable/mondo/src/common/libmondo-tools.c (modified) (18 diffs)

branches/stable/mondo/src/common/libmondo-tools.c

@@ -229 +229 @@
         }
     }
-//  log_msg(1, "tmp = '%s'", tmp);
+//  mr_msg(1, "tmp = '%s'", tmp);
     d = atof(tmp);
 #endif
-    log_msg(1, "g_kernel_version = %f", d);
+    mr_msg(1, "g_kernel_version = %f", d);
     return (d);
 }
@@ -430 +430 @@
         1024;
 
-    log_msg(1, "Foo");
+    mr_msg(1, "Foo");
     if (bkpinfo->backup_media_type == tape) {
-        log_msg(1, "Bar");
+        mr_msg(1, "Bar");
         sprintf(tmp, "mt -f %s status", bkpinfo->media_device);
-        log_msg(1, "tmp = '%s'", tmp);
+        mr_msg(1, "tmp = '%s'", tmp);
         if (run_program_and_log_output(tmp, 3)) {
             fatal_error
@@ -548 +548 @@
             }       
         }
-        log_msg(2, "call_make_iso (DVD res) is ... %s",
+        mr_msg(2, "call_make_iso (DVD res) is ... %s",
                 bkpinfo->call_make_iso);
     }                           // end of DVD code
@@ -791 +791 @@
     int i;
 
-    log_msg(1, "Hi");
+    mr_msg(1, "Hi");
     assert(bkpinfo != NULL);
     memset((void *) bkpinfo, 0, sizeof(struct s_bkpinfo));
@@ -1102 +1102 @@
     } else if (strstr(value, "/dev/") && strstr(value, "t0")
                && !strcmp(label, "media-dev")) {
-        log_msg(2, "FYI, I shan't read new value for %s - already got %s",
+        mr_msg(2, "FYI, I shan't read new value for %s - already got %s",
                 label, value);
         return (0);
@@ -1184 +1184 @@
 
     if (!g_autofs_exe[0]) {
-        log_msg(3, "No autofs detected.");
+        mr_msg(3, "No autofs detected.");
     } else {
-        log_msg(3, "%s --- autofs detected", g_autofs_exe);
+        mr_msg(3, "%s --- autofs detected", g_autofs_exe);
 // FIXME -- only disable it if it's running ---  sprintf(tmp, "%s status", autofs_exe);
         sprintf(tmp, "%s stop", g_autofs_exe);
@@ -1206 +1206 @@
 
     if (!g_autofs_stopped || !g_autofs_exe[0]) {
-        log_msg(3, "No autofs detected.");
+        mr_msg(3, "No autofs detected.");
         return;
     }
@@ -1227 +1227 @@
     char command[MAX_STR_LEN];
 
-    log_msg(1, "Started sub");
-    log_msg(4, "About to set g_boot_mountpt[0] to '\\0'");
+    mr_msg(1, "Started sub");
+    mr_msg(4, "About to set g_boot_mountpt[0] to '\\0'");
     g_boot_mountpt[0] = '\0';
-    log_msg(4, "Done. Great. Seeting command to something");
+    mr_msg(4, "Done. Great. Seeting command to something");
     strcpy(command,
            "grep -v \":\" /etc/fstab | grep -vE '^#.*$' | grep -E \"[   ]/boot[     ]\" | tr -s ' ' '\t' | cut -f1 | head -n1");
-    log_msg(4, "Cool. Command = '%s'", command);
+    mr_msg(4, "Cool. Command = '%s'", command);
     strcpy(tmp, call_program_and_get_last_line_of_output(command));
-    log_msg(4, "tmp = '%s'", tmp);
+    mr_msg(4, "tmp = '%s'", tmp);
     if (tmp[0]) {
         log_it("/boot is at %s according to /etc/fstab", tmp);
@@ -1241 +1241 @@
             if (!run_program_and_log_output("mount /boot", 5)) {
                 strcpy(g_boot_mountpt, "/boot");
-                log_msg(1, "Mounted /boot");
+                mr_msg(1, "Mounted /boot");
             } else {
                 log_it("...ignored cos it's a label :-)");
@@ -1247 +1247 @@
         } else {
             sprintf(command, "mount | grep -E '^%s'", tmp);
-            log_msg(3, "command = %s", command);
+            mr_msg(3, "command = %s", command);
             if (run_program_and_log_output(command, 5)) {
                 strcpy(g_boot_mountpt, tmp);
@@ -1257 +1257 @@
                 if (run_program_and_log_output(tmp, 5)) {
                     g_boot_mountpt[0] = '\0';
-                    log_msg(1, "Plan B");
+                    mr_msg(1, "Plan B");
                     if (!run_program_and_log_output("mount /boot", 5)) {
                         strcpy(g_boot_mountpt, "/boot");
-                        log_msg(1, "Plan B worked");
+                        mr_msg(1, "Plan B worked");
                     } else {
-                        log_msg(1,
+                        mr_msg(1,
                                 "Plan B failed. Unable to mount /boot for backup purposes. This probably means /boot is mounted already, or doesn't have its own partition.");
                     }
@@ -1269 +1269 @@
         }
     }
-    log_msg(1, "Ended sub");
+    mr_msg(1, "Ended sub");
 }
 
@@ -1280 +1280 @@
     char tmp[MAX_STR_LEN];
 
-    log_msg(3, "starting");
+    mr_msg(3, "starting");
     if (g_boot_mountpt[0]) {
         sprintf(tmp, "umount %s", g_boot_mountpt);
@@ -1287 +1287 @@
         }
     }
-    log_msg(3, "leaving");
+    mr_msg(3, "leaving");
 }
 
@@ -1336 +1336 @@
 
 /**
- * The standard log_debug_msg() (log_msg() also due to a macro). Writes some describing
+ * The standard log_debug_msg() (mr_msg() also due to a macro). Writes some describing
  * information to the logfile.
  */
@@ -1444 +1444 @@
        for(i=0;list_of_arrays[i];i++)
        {
-       log_msg(5, "Allocating %d", i);
+       mr_msg(5, "Allocating %d", i);
        ppcurr = list_of_arrays[i];
        if (mal)
@@ -1456 +1456 @@
        }
        }
-       log_msg(5, "Returning");
+       mr_msg(5, "Returning");
      */
 }
@@ -1490 +1490 @@
            ("ps ax | grep -w magicdev | grep -v grep | tr -s '\t' ' '| cut -d' ' -f6-99"));
     if (g_magicdev_command[0]) {
-        log_msg(1, "g_magicdev_command = '%s'", g_magicdev_command);
+        mr_msg(1, "g_magicdev_command = '%s'", g_magicdev_command);
         paranoid_system("killall magicdev");
     }