Changeset 1086 in MondoRescue for trunk/mondo/src/common/libmondo-tools.c

Timestamp:

Feb 2, 2007, 11:21:27 PM (17 years ago)

Author:

Bruno Cornec

Message:

log_msg => mr_msg in trunk

File:

• trunk/mondo/src/common/libmondo-tools.c (modified) (13 diffs)

trunk/mondo/src/common/libmondo-tools.c

@@ -232 +232 @@
         }
     }
-//  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);
 }
@@ -368 +368 @@
         1024;
 
-    log_msg(1, "Foo");
+    mr_msg(1, "Foo");
     if (bkpinfo->backup_media_type == tape) {
-        log_msg(1, "Bar");
+        mr_msg(1, "Bar");
         mr_asprintf(&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
@@ -496 +496 @@
             mr_free(command);
         }
-        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
@@ -739 +739 @@
     int i = 0;
 
-    log_msg(1, "Hi");
+    mr_msg(1, "Hi");
 
     assert(bkpinfo != NULL);
@@ -1058 +1058 @@
          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);
@@ -1114 +1114 @@
     char *command;
 
-    log_msg(1, "Started sub");
-    log_msg(4, "Setting command to something");
+    mr_msg(1, "Started sub");
+    mr_msg(4, "Setting command to something");
     mr_asprintf(&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);
     tmp = call_program_and_get_last_line_of_output(command);
     mr_free(command);
 
-    log_msg(4, "tmp = '%s'", tmp);
+    mr_msg(4, "tmp = '%s'", tmp);
     if (tmp) {
         log_it("/boot is at %s according to /etc/fstab", tmp);
@@ -1129 +1129 @@
                 mr_free(g_boot_mountpt);
                 mr_asprintf(&g_boot_mountpt, "/boot");
-                log_msg(1, "Mounted /boot");
+                mr_msg(1, "Mounted /boot");
             } else {
                 log_it("...ignored cos it's a label :-)");
@@ -1135 +1135 @@
         } else {
             mr_asprintf(&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)) {
                 mr_free(g_boot_mountpt);
@@ -1151 +1151 @@
                     mr_asprintf(&g_boot_mountpt, " ");
                     */
-                    log_msg(1, "Plan B");
+                    mr_msg(1, "Plan B");
                     if (!run_program_and_log_output("mount /boot", 5)) {
                         mr_free(g_boot_mountpt);
                         mr_asprintf(&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.");
                     }
@@ -1167 +1167 @@
     }
     mr_free(tmp);
-    log_msg(1, "Ended sub");
+    mr_msg(1, "Ended sub");
 }
 
@@ -1178 +1178 @@
     char *tmp;
 
-    log_msg(3, "starting");
+    mr_msg(3, "starting");
     if (g_boot_mountpt != NULL) {
         mr_asprintf(&tmp, "umount %s", g_boot_mountpt);
@@ -1186 +1186 @@
         mr_free(tmp);
     }
-    log_msg(3, "leaving");
+    mr_msg(3, "leaving");
 }
 
@@ -1291 +1291 @@
            ("ps ax | grep -w magicdev | grep -v grep | tr -s '\t' ' '| cut -d' ' -f6-99");
     if (g_magicdev_command) {
-        log_msg(1, "g_magicdev_command = '%s'", g_magicdev_command);
+        mr_msg(1, "g_magicdev_command = '%s'", g_magicdev_command);
         paranoid_system("killall magicdev");
     }