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

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

@@ -46 +46 @@
 extern bool g_text_mode;
 extern void pause_for_N_seconds(int, char *);
+extern char *MONDO_LOGFILE;
 
 FILE *g_fprep = NULL;
@@ -218 +219 @@
     }
     mr_asprintf(&command,
-            "for i in `%s | cut -d\"'\" -f2 | sort -r` ; do echo \"Shutting down lv $i\" >> "
-            MONDO_LOGFILE "; %s -f $i; done", lvscan_sz, lvremove_sz);
+            "for i in `%s | cut -d\"'\" -f2 | sort -r` ; do echo \"Shutting down lv $i\" >> %s ; %s -f $i; done", lvscan_sz, MONDO_LOGFILE, lvremove_sz);
     mr_free(lvscan_sz);
     mr_free(lvremove_sz);
@@ -228 +228 @@
     sleep(1);
     mr_asprintf(&command,
-            "for i in `%s | grep -i lvm | cut -d'\"' -f2` ; do %s -a n $i ; %s $i; echo \"Shutting down vg $i\" >> "
-            MONDO_LOGFILE "; done", vgscan_sz, vgchange_sz, vgremove_sz);
+            "for i in `%s | grep -i lvm | cut -d'\"' -f2` ; do %s -a n $i ; %s $i; echo \"Shutting down vg $i\" >> %s ; done", vgscan_sz, vgchange_sz, vgremove_sz, MONDO_LOGFILE);
     mr_free(vgchange_sz);
     mr_free(vgremove_sz);
@@ -311 +310 @@
                 lvmversion = 2;
             if (lvmversion == 2) {
-                mr_asprintf(&tmp, call_program_and_get_last_line_of_output
-                       ("tail -n5 " MONDO_LOGFILE " | grep Insufficient | tail -n1"));
+                mr_asprintf(&tmp1, "tail -n5 %s | grep Insufficient | tail -n1", MONDO_LOGFILE);
+                mr_asprintf(&tmp, call_program_and_get_last_line_of_output(tmp1));
+                free(tmp1);
             } else {
-                mr_asprintf(&tmp, call_program_and_get_last_line_of_output
-                       ("tail -n5 " MONDO_LOGFILE " | grep lvcreate | tail -n1"));
+                mr_asprintf(&tmp1, "tail -n5 %s | grep lvcreate | tail -n1", MONDO_LOGFILE);
+                mr_asprintf(&tmp, call_program_and_get_last_line_of_output(tmp1));
+                free(tmp1);
             }
             for (p = tmp; *p != '\0' && !isdigit(*p); p++);