Changeset 1315 in MondoRescue for branches/2.2.2/mondo/src/mondorestore/mondo-prep.c

Timestamp:

Apr 16, 2007, 4:13:59 PM (17 years ago)

Author:

Bruno Cornec

Message:

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)
One include has been created for each bianry containing only that declaration ofr the moment, but which will be extended to include all local definitions (ps_* e.g.)
Doc updated accordingly
LOGFILE in restore process is now passed in the environment and not duplicated anymore
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.

File:

• branches/2.2.2/mondo/src/mondorestore/mondo-prep.c (modified) (2 diffs)

branches/2.2.2/mondo/src/mondorestore/mondo-prep.c

@@ -337 +337 @@
     /**  buffers **********************************************/
     char *tmp;
+    char *tmp1 = NULL;
     char *incoming;
     char *command;
@@ -486 +487 @@
             log_it("%s... so I'll get creative.", tmp);
             if (lvmversion == 2) {
-                strcpy(tmp, call_program_and_get_last_line_of_output
-                       ("tail -n5 /var/log/mondo-archive.log | grep Insufficient | tail -n1"));
+                asprintf(&tmp1, "tail -n5 %s | grep Insufficient | tail -n1", MONDO_LOGFILE);
+                strcpy(tmp, call_program_and_get_last_line_of_output(tmp1));
+                free(tmp1);
             } else {
-                strcpy(tmp, call_program_and_get_last_line_of_output
-                       ("tail -n5 /var/log/mondo-archive.log | grep lvcreate | tail -n1"));
+                asprintf(&tmp1, "tail -n5 %s | grep lvcreate | tail -n1", MONDO_LOGFILE);
+                strcpy(tmp, call_program_and_get_last_line_of_output(tmp1));
+                free(tmp1);
             }
             for (p = tmp; *p != '\0' && !isdigit(*p); p++);