Changeset 1478 in MondoRescue

Timestamp:

May 31, 2007, 7:09:24 PM (18 years ago)

Author:

Bruno Cornec

Message:

• Adds dmesg result to init log
• Less verbosity in the sort function (reduces log file and helps reading it)

(merge -r 1473:1477 of 2.2.4)

Location:

branches/stable

Files:

• mindi/rootfs/sbin/init (modified) (1 diff)
• mondo/src/common/libmondo-filelist.c (modified) (3 diffs)

branches/stable/mindi/rootfs/sbin/init

@@ -539 +539 @@
 lsmod >> $LOGFILE
 LogIt "-------------"
+LogIt "dmesg result:"
+LogIt "-------------"
+dmesg >> $LOGFILE
 
 #-------------------------------

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

@@ -152 +152 @@
     int retval = 0;
 
-    mr_msg(1, "Sorting file %s", orig_fname);
+    mr_msg(5, "Sorting file %s", orig_fname);
     mr_asprintf(&tmp_fname, "/tmp/sort.%d.%d.%d", (int) (random() % 32768),
              (int) (random() % 32768), (int) (random() % 32768));
 
     if (!does_file_exist(orig_fname)) {
+        log_msg(2, "file %s empty", orig_fname);
         return (0);
     }                           // no sense in trying to sort an empty file
@@ -168 +169 @@
         mr_msg(2, "Failed to sort %s - oh dear", orig_fname);
     } else {
-        mr_msg(2, "Sorted %s --> %s OK. Copying it back to %s now",
+        mr_msg(5, "Sorted %s --> %s OK. Copying it back to %s now",
                 orig_fname, tmp_fname, orig_fname);
         mr_asprintf(&command, "mv -f %s %s", tmp_fname, orig_fname);
-        retval += run_program_and_log_output(command, 2);
+        retval += run_program_and_log_output(command, 5);
         mr_free(command);
 
@@ -178 +179 @@
                     orig_fname);
         } else {
-            mr_msg(2, "%s was sorted OK.", orig_fname);
+            mr_msg(5, "%s was sorted OK.", orig_fname);
         }
     }
     mr_free(tmp_fname);
-    mr_msg(1, "Finished sorting file %s", orig_fname);
+    mr_msg(5, "Finished sorting file %s", orig_fname);
     return (retval);
 }