Ignore:
Timestamp:
Nov 6, 2007, 1:37:38 AM (12 years ago)
Author:
Bruno Cornec
Message:

Continue on configuration file items (compression)

File:
1 edited

Legend:

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

    r1671 r1769  
    329329 * - Used: @c bkpinfo->backup_media_type
    330330 * - Used: @c bkpinfo->writer_speed
    331  * - Used: @c bkpinfo->compression_level
    332331 * - Used: @c bkpinfo->include_paths
    333332 * - Used: @c bkpinfo->prefix
     
    340339 * - Used: @c bkpinfo->scratchdir
    341340 * - Used: @c bkpinfo->tmpdir
    342  * - Used: @c bkpinfo->use_lzo
    343341 * - Modified: @c bkpinfo->call_before_iso
    344342 * - Modified: @c bkpinfo->call_make_iso
    345343 * - Modified: @c bkpinfo->optimal_set_size
    346  * - Modified: @c bkpinfo->zip_exe
    347  * - Modified: @c bkpinfo->zip_suffix
    348344 *
    349345 * @return number of errors, or 0 for success.
     
    436432    }
    437433    mr_free(command);
    438 
    439     if (bkpinfo->use_lzo) {
    440         strcpy(bkpinfo->zip_exe, "lzop");
    441         strcpy(bkpinfo->zip_suffix, "lzo");
    442     } else if (bkpinfo->use_gzip) {
    443         strcpy(bkpinfo->zip_exe, "gzip");
    444         strcpy(bkpinfo->zip_suffix, "gz");
    445     } else if (bkpinfo->compression_level != 0) {
    446         strcpy(bkpinfo->zip_exe, "bzip2");
    447         strcpy(bkpinfo->zip_suffix, "bz2");
    448     } else {
    449         bkpinfo->zip_exe[0] = bkpinfo->zip_suffix[0] = '\0';
    450     }
    451434
    452435// CD-R or CD-RW or DVD
     
    734717    bkpinfo->manual_tray = mr_conf->manual_tray;
    735718    bkpinfo->internal_tape_block_size = mr_conf->internal_tape_blocksize;
     719    bkpinfo->compression_level = mr_conf->compression_level;
     720    mr_asprintf(&tmp,mr_conf->compression_suffix);
     721    bkpinfo->compression_suffix = tmp;
     722    mr_asprintf(&tmp,mr_conf->compression_tool);
     723    bkpinfo->compression_tool = tmp;
    736724    mr_asprintf(&tmp,mr_conf->media_device);
    737725    bkpinfo->media_device = tmp;
     
    762750    }
    763751    bkpinfo->boot_device[0] = '\0';
    764     bkpinfo->zip_exe[0] = '\0';
    765     bkpinfo->zip_suffix[0] = '\0';
    766752    bkpinfo->restore_path[0] = '\0';
    767     bkpinfo->use_lzo = FALSE;
    768     bkpinfo->use_gzip = FALSE;
    769753    bkpinfo->do_not_compress_these[0] = '\0';
    770754    bkpinfo->verify_data = FALSE;
     
    798782    bkpinfo->differential = FALSE;
    799783    bkpinfo->writer_speed = mr_conf->iso_burning_speed;
    800     bkpinfo->compression_level = 3;
    801784}
    802785
     
    913896    retval += whine_if_not_found(mr_conf->iso_burning_cmd);
    914897    retval += whine_if_not_found(MKE2FS_OR_NEWFS);
    915     retval += whine_if_not_found("bzip2");
     898    retval += whine_if_not_found(mr_conf->compresstion_tool);
    916899    retval += whine_if_not_found("gzip");
    917900    retval += whine_if_not_found("awk");
Note: See TracChangeset for help on using the changeset viewer.