Ignore:
Timestamp:
Jun 2, 2008, 10:49:01 AM (12 years ago)
Author:
Bruno Cornec
Message:

svn merge -r 1938:1976 $SVN_M/branches/2.2.6

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mondo/src/common/libmondo-tools.c

    r1924 r1977  
    677677
    678678void setup_tmpdir(char *path) {
    679    
     679
    680680    char *tmp = NULL;
    681681    char *p = NULL;
     
    687687        paranoid_free(tmp);
    688688    }
    689        
     689
    690690    if (path != NULL) {
    691691        asprintf(&tmp, "%s/mondo.tmp.XXXXXX", path);
     
    758758    }
    759759    bkpinfo->boot_device[0] = '\0';
    760     bkpinfo->restore_path[0] = '\0';
     760    bkpinfo->image_devs[0] = '\0';
     761    bkpinfo->compression_level = 3;
    761762    bkpinfo->do_not_compress_these[0] = '\0';
    762763    bkpinfo->verify_data = FALSE;
    763764    bkpinfo->backup_data = FALSE;
    764765    bkpinfo->restore_data = FALSE;
     766    bkpinfo->use_star = FALSE;
     767    bkpinfo->internal_tape_block_size = DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
    765768    bkpinfo->disaster_recovery =
    766769        (am_I_in_disaster_recovery_mode()? TRUE : FALSE);
     
    772775    mr_asprintf(&tmp,mr_conf->prefix);
    773776    bkpinfo->prefix = tmp;
    774 
    775     bkpinfo->make_filelist = TRUE;  // unless -J supplied to mondoarchive
     777    sensibly_set_tmpdir_and_scratchdir();
     778
    776779    bkpinfo->optimal_set_size = 0;
    777     bkpinfo->backup_media_type = none;
    778780    bkpinfo->backup_media_string[0] = '\0';
    779781    strcpy(bkpinfo->include_paths, "/");
     782    bkpinfo->restore_path[0] = '\0';
    780783    bkpinfo->call_before_iso[0] = '\0';
    781784    bkpinfo->call_make_iso[0] = '\0';
    782785    bkpinfo->call_after_iso[0] = '\0';
    783     bkpinfo->image_devs[0] = '\0';
    784     bkpinfo->postnuke_tarball[0] = '\0';
    785786    bkpinfo->nfs_mount[0] = '\0';
    786787    bkpinfo->nfs_remote_dir[0] = '\0';
     788    bkpinfo->postnuke_tarball[0] = '\0';
    787789    bkpinfo->wipe_media_first = FALSE;
    788     bkpinfo->differential = FALSE;
     790    bkpinfo->differential = 0;
     791    bkpinfo->please_dont_eject = FALSE;
    789792    bkpinfo->writer_speed = mr_conf->iso_burning_speed;
     793    bkpinfo->manual_cd_tray = FALSE;
     794    bkpinfo->nonbootable_backup = FALSE;
     795    bkpinfo->make_cd_use_lilo = FALSE;
     796    bkpinfo->use_obdr = FALSE;
     797    bkpinfo->restore_mode = interactive;
    790798}
    791799
Note: See TracChangeset for help on using the changeset viewer.