Changeset 815 for trunk


Ignore:
Timestamp:
Sep 23, 2006, 10:37:43 AM (13 years ago)
Author:
bruno
Message:

merge -r807:814 $SVN_M/branches/stable

Location:
trunk/mondo
Files:
4 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/mondo/mondo/common/libmondo-archive.c

    r783 r815  
    20252025            delete_when_done = TRUE;
    20262026        } else {
    2027             // Call ntfsclone (formerly partimagehack) if it's a /dev entry (i.e. a partition to be imaged)
    2028             log_msg(2, "bigfile_fname = '%s'", bigfile_fname);
     2027            // Call ntfsclone (formerly partimagehack) if it's a /dev entry
     2028            // (i.e. a partition to be imaged)
     2029            log_msg(2, "bigfile_fname = %s", bigfile_fname);
    20292030            use_ntfsprog = FALSE;
    20302031            if (!strncmp(bigfile_fname, "/dev/", 5)
     
    20342035                        "Calling ntfsclone in background because %s is an NTFS partition",
    20352036                        bigfile_fname);
    2036                 asprintf(&sz_devfile, "/tmp/%d.%d.000",
     2037                asprintf(&sz_devfile, "%s/%d.%d.000",
     2038                        bkpinfo->tmpdir,
    20372039                         (int) (random() % 32768),
    20382040                         (int) (random() % 32768));
  • trunk/mondo/mondo/mondoarchive/main.c

    r808 r815  
    123123}
    124124
     125/* Return a string containing the date */
     126char *mr_date(void) {
     127   
     128    time_t tcurr;
     129
     130    tcurr = time(NULL);
     131    return(ctime(&tcurr));
     132}
     133
     134/*-----------------------------------------------------------*/
     135
     136
    125137
    126138/**
     
    167179    /* Initialize Configuration Structure */
    168180    mr_archive_init_conf(bkpinfo->mr_conf);
    169     log_msg(0, "Start date : %s", get_time());
     181
     182    /* initialize log file with time stamp */
     183    unlink(MONDO_LOGFILE);
     184    log_msg(0, "Time started: %s", mr_date());
    170185
    171186    /* make sure PATH environmental variable allows access to mkfs, fdisk, etc. */
     
    179194    /* Add MONDO_SHARE environment variable for mindi */
    180195    setenv_mondo_share();
    181 
    182     unlink(MONDO_LOGFILE);
    183196
    184197    /* Configure the bkpinfo structure, global file paths, etc. */
     
    417430
    418431    run_program_and_log_output("date", 1);
    419     log_msg(0, "End date : %s", get_time());
     432
     433    /* finalize log file with time stamp */
     434    log_msg(0, "Time finished: %s", mr_date());
    420435
    421436    if (!g_text_mode) {
  • trunk/mondo/mondo/mondoarchive/mondo-cli.c

    r808 r815  
    515515                 * so handled here for the moment */
    516516                q--;
    517                 if (*q = '/') {
     517                if (*q == '/') {
    518518                    *q = '\0';
    519519                }
  • trunk/mondo/mondo/mondorestore/mondo-restore.c

    r808 r815  
    13351335                "Calling ntfsclone in background because %s is a /dev entry",
    13361336                outfile_fname);
    1337         asprintf(&ntfsprog_fifo, "/tmp/%d.%d.000", (int) (random() % 32768),
     1337        asprintf(&ntfsprog_fifo, "%s/%d.%d.000",
     1338                bkpinfo->tmpdir,
     1339                (int) (random() % 32768),
    13381340                (int) (random() % 32768));
    13391341        mkfifo(ntfsprog_fifo, 0x770);
Note: See TracChangeset for help on using the changeset viewer.