Ignore:
Timestamp:
Apr 17, 2007, 12:08:14 AM (12 years ago)
Author:
bruno
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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mondo/src/mondorestore/mondorestore.c

    r1297 r1326  
    2626#include "mr-externs.h"
    2727#include "mondo-restore.h"
     28#include "mondorestore.h"
    2829#include "mondo-rstr-compare-EXT.h"
    2930#include "mondo-rstr-tools-EXT.h"
     
    119120 */
    120121char *g_mountlist_fname = NULL;
    121 
    122 /* Busybox ps has no option and PID in first pos */
    123 char *ps_options = "";
    124 char *ps_proc_id = "$1";
    125122
    126123extern char *g_getfacl;
     
    28742871    make_hole_for_dir("/tmp/tmpfs");    /* just in case... */
    28752872    run_program_and_log_output("umount " MNT_CDROM, FALSE);
    2876     run_program_and_log_output
    2877         ("ln -sf /var/log/mondo-archive.log /tmp/mondo-restore.log",
    2878          FALSE);
    28792873
    28802874    run_program_and_log_output("rm -Rf /tmp/tmpfs/mondo.tmp.*", FALSE);
     
    32253219
    32263220    log_to_screen
    3227         (_("Restore log copied to /tmp/mondo-restore.log on your hard disk"));
     3221        (_("Restore log (%s) copied to /var/log on your hard disk"), MONDO_LOGFILE);
    32283222    log_to_screen(_("Mondo-restore is exiting (retval=%d)"), retval);
    32293223
Note: See TracChangeset for help on using the changeset viewer.