Changeset 1326 in MondoRescue for branches/stable/mondo/src/mondorestore/mondo-rstr-compare.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/mondorestore/mondo-rstr-compare.c (modified) (2 diffs)

branches/stable/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -15 +15 @@
 #include "mondo-rstr-tools-EXT.h"
 
+extern char *MONDO_LOGFILE;
+
 //static char cvsid[] = "$Id$";
 
@@ -90 +92 @@
     }
     mr_asprintf(&command,
-            "md5sum \"%s%s\" > /tmp/md5sum.txt 2> /tmp/errors.txt",
+            "md5sum \"%s%s\" > /tmp/md5sum.txt 2> /tmp/errors",
             MNT_RESTORING, bigfile_fname);
     mr_msg(2, command);
     if (system(command)) {
         log_OS_error("Warning - command failed");
-        paranoid_system("cat /tmp/errors >> /tmp/mondo-restore.log 2> /dev/null");
+        mr_asprintf(&tmp, "cat /tmp/errors >> %s 2> /dev/null", MONDO_LOGFILE);
+        paranoid_system(tmp);
+        mr_free(tmp);
         mr_free(command);
         mr_free(bigfile_fname);