Ignore:
Timestamp:
May 13, 2006, 7:38:44 PM (13 years ago)
Author:
bcornec
Message:

merge -r 534:538 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/mondo/mondoarchive/main.c

    r507 r539  
    133133{
    134134    struct s_bkpinfo *bkpinfo;
     135    struct s_mrconf *mrconf;
    135136    char *tmp;
    136137    int res = 0;
     
    160161    malloc_libmondo_global_strings();
    161162
     163    /* Initialize Configuration Structure */
     164    mrarchive_init_conf(mrconf);
     165
     166    res = 0;
     167    retval = 0;
    162168    diffs = 0;
    163169    printf(_("Initializing...\n"));
     
    327333    /* If we're meant to backup then backup */
    328334    if (bkpinfo->backup_data) {
    329         res = backup_data(bkpinfo);
     335        res = backup_data(bkpinfo, mrconf);
    330336        retval += res;
    331337        if (res) {
     
    363369    }
    364370
    365     if (does_file_exist("/root/images/mindi/mondorescue.iso")) {
     371    if (does_file_exist("/var/cache/mindi/mondorescue.iso")) {
    366372        log_to_screen
    367             (_("/root/images/mindi/mondorescue.iso, a boot/utility CD, is available if you want it."));
     373            (_("/var/cache/mindi/mondorescue.iso, a boot/utility CD, is available if you want it."));
    368374    }
    369375
Note: See TracChangeset for help on using the changeset viewer.