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

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)

Location:

branches/stable/mondo/src/mondorestore

Files:

• mondo-prep.c (modified) (4 diffs)
• mondo-rstr-compare.c (modified) (2 diffs)
• mondo-rstr-tools.c (modified) (4 diffs)
• mondorestore.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++);

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);

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

@@ -44 +44 @@
 
 extern int g_partition_table_locked_up;
+extern char *MONDO_LOGFILE;
 
 /* Should we use or not extended attributes and acl when restoring */
@@ -1476 +1477 @@
         mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
         log_to_screen
-            (_
-             ("GRUB ran w/error(s). See /tmp/mondo-restore.log for more info."));
+            (_("GRUB ran w/error(s). See %s for more info.", MONDO_LOGFILE));
         mr_msg(1, "Type:-");
         mr_msg(1, "    mount-me");
@@ -1745 +1745 @@
         mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
         log_to_screen
-            (_
-             ("MBR+fstab processed w/error(s). See /tmp/mondo-restore.log for more info."));
+            (_("MBR+fstab processed w/error(s). See %s for more info.", MONDO_LOGFILE));
     } else {
         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
@@ -1976 +1975 @@
     sync();
 
-    if (run_program_and_log_output
-        ("cp -f /tmp/mondo-restore.log " MNT_RESTORING "/tmp/", FALSE)) {
+    sprintf(tmp, "cp -f %s " MNT_RESTORING "/var/log", MONDO_LOGFILE);
+    if (run_program_and_log_output(tmp, FALSE)) {
         mr_msg(1,
-                "Error. Failed to copy log to PC's /tmp dir. (Mounted read-only?)");
-    }
-    if (run_program_and_log_output
-        ("cp -f /tmp/mondo-restore.log " MNT_RESTORING "/root/", FALSE)) {
-        mr_msg(1,
-                "Error. Failed to copy log to PC's /root dir. (Mounted read-only?)");
+                "Error. Failed to copy log to PC's /var/log dir. (Mounted read-only?)");
     }
     if (does_file_exist("/tmp/DUMBASS-GENTOO")) {

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

@@ -26 +26 @@
 #include "mr-externs.h"
 #include "mondo-restore.h"
+#include "mondorestore.h"
 #include "mondo-rstr-compare-EXT.h"
 #include "mondo-rstr-tools-EXT.h"
@@ -119 +120 @@
  */
 char *g_mountlist_fname = NULL;
-
-/* Busybox ps has no option and PID in first pos */
-char *ps_options = "";
-char *ps_proc_id = "$1";
 
 extern char *g_getfacl;
@@ -2874 +2871 @@
     make_hole_for_dir("/tmp/tmpfs");    /* just in case... */
     run_program_and_log_output("umount " MNT_CDROM, FALSE);
-    run_program_and_log_output
-        ("ln -sf /var/log/mondo-archive.log /tmp/mondo-restore.log",
-         FALSE);
 
     run_program_and_log_output("rm -Rf /tmp/tmpfs/mondo.tmp.*", FALSE);
@@ -3225 +3219 @@
 
     log_to_screen
-        (_("Restore log copied to /tmp/mondo-restore.log on your hard disk"));
+        (_("Restore log (%s) copied to /var/log on your hard disk"), MONDO_LOGFILE);
     log_to_screen(_("Mondo-restore is exiting (retval=%d)"), retval);