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

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