Changeset 1326 in MondoRescue for branches/stable/mondo/src/common/libmondo-archive.c

Timestamp:

Apr 17, 2007, 12:08:14 AM (17 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)

File:

• branches/stable/mondo/src/common/libmondo-archive.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.");