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/mondo-rstr-tools.c

    r1275 r1326  
    4444
    4545extern int g_partition_table_locked_up;
     46extern char *MONDO_LOGFILE;
    4647
    4748/* Should we use or not extended attributes and acl when restoring */
     
    14761477        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
    14771478        log_to_screen
    1478             (_
    1479              ("GRUB ran w/error(s). See /tmp/mondo-restore.log for more info."));
     1479            (_("GRUB ran w/error(s). See %s for more info.", MONDO_LOGFILE));
    14801480        mr_msg(1, "Type:-");
    14811481        mr_msg(1, "    mount-me");
     
    17451745        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
    17461746        log_to_screen
    1747             (_
    1748              ("MBR+fstab processed w/error(s). See /tmp/mondo-restore.log for more info."));
     1747            (_("MBR+fstab processed w/error(s). See %s for more info.", MONDO_LOGFILE));
    17491748    } else {
    17501749        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     
    19761975    sync();
    19771976
    1978     if (run_program_and_log_output
    1979         ("cp -f /tmp/mondo-restore.log " MNT_RESTORING "/tmp/", FALSE)) {
     1977    sprintf(tmp, "cp -f %s " MNT_RESTORING "/var/log", MONDO_LOGFILE);
     1978    if (run_program_and_log_output(tmp, FALSE)) {
    19801979        mr_msg(1,
    1981                 "Error. Failed to copy log to PC's /tmp dir. (Mounted read-only?)");
    1982     }
    1983     if (run_program_and_log_output
    1984         ("cp -f /tmp/mondo-restore.log " MNT_RESTORING "/root/", FALSE)) {
    1985         mr_msg(1,
    1986                 "Error. Failed to copy log to PC's /root dir. (Mounted read-only?)");
     1980                "Error. Failed to copy log to PC's /var/log dir. (Mounted read-only?)");
    19871981    }
    19881982    if (does_file_exist("/tmp/DUMBASS-GENTOO")) {
Note: See TracChangeset for help on using the changeset viewer.