Changeset 1326 in MondoRescue for branches/stable/mondo/src/common

Timestamp:

Apr 17, 2007, 12:08:14 AM (18 years ago)

Author:

Bruno Cornec

Message:

• MONDO_LOGFILE is rather a char* exported by each main program (consolidation of those mecanisms in .h files with ps_*)
• One include has been created for each binary containing only the specific declarations
• Log files are now consistent: mondoarchive.log for mondoarchive (containing also mindi.log) and mondorestore.log for mondorestore (copied from /tmp (ram) to /var/log (disk) at the end of the restore)
• Doc updated accordingly
• LOGFILE in restore process is now passed in the environment and not duplicated a nymore
• LogIt is not redifined either
• LOGFILE should be put in environment by mondoarchive for mindi's usage but that's a step left for later.
• label-partitions-as-necessary should now work correctly for LABEL and UUID (grep -w removed)
• Remove useless script compare-me

(All coming from 2.2.2) (remains changes in my-stuff.h coming later on)

Location:

branches/stable/mondo/src/common

Files:

• libmondo-archive.c (modified) (2 diffs)
• libmondo-filelist.c (modified) (1 diff)
• newt-specific.c (modified) (2 diffs)

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

@@ -84 +84 @@
 extern char *g_getfacl;
 extern char *g_getfattr;
+extern char *MONDO_LOGFILE;
 
 
@@ -1789 +1790 @@
             } else {
                 log_to_screen("%s...OK", message_to_screen);
-                if (!run_program_and_log_output
-                    ("tail -n10 /var/log/mondo-archive.log | grep -F ':-('",
-                     1)) {
+                sprintf(tmp, "tail -n10 %s | grep -F ':-('", MONDO_LOGFILE);
+                if (!run_program_and_log_output(tmp, 1)) {
                     log_to_screen
                         ("Despite nonfatal errors, growisofs confirms the write was successful.");

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

@@ -35 +35 @@
 #define MAX_SKEL_DEPTH 3
 
+
+extern char *MONDO_LOGFILE;
 
 int mondo_makefilelist(char *logfile, char *tmpdir, char *scratchdir,

branches/stable/mondo/src/common/newt-specific.c

@@ -31 +31 @@
 #include "libmondo-fork-EXT.h"
 #include "newt-specific-EXT.h"
+
+extern char *MONDO_LOGFILE;
 
 /*@unused@*/
@@ -344 +346 @@
     printf(_("The list's members can help you, if you attach that file to your e-mail.\n"));
     printf(_("Log file: %s\n"), MONDO_LOGFILE);
-/*
-    system
-        ("gzip -9c /var/log/mondo-archive.log > /tmp/MA.log.gz 2> /dev/null");
-    if (does_file_exist("/tmp/MA.log.gz")) {
-        printf
-            ("FYI, I have gzipped the log and saved it to /tmp/MA.log.gz\n");
-        }
-*/
     printf(_("Mondo has aborted.\n"));
     register_pid(0, "mondo");   // finish() does this too, FYI