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

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")) {