Changeset 1639 for branches/stable


Ignore:
Timestamp:
Sep 20, 2007, 10:20:45 PM (12 years ago)
Author:
bruno
Message:

More conf file items handled

Location:
branches/stable
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mondo/distributions/conf/mondo.conf.dist

    r1637 r1639  
    8181
    8282#
    83 # Size in MB of the slices for biggiefiles
    84 #
    85 mondo_slice_size=4096
    86 
    87 #
    88 # deplist file used (either fill path or relative to
    89 # mondo's configuration dir
    90 #
    91 mondo_deplist_file="deplist.txt"
    92 
    93 #
    94 # Write boot floppies (yes|no) ?
    95 #
    96 mondo_write_boot_floppy=no
    97 
    98 #
    9983# Create mindi CD (yes|no) ?
    10084#
     
    10993#
    11094# Additional modules to support
    111 # (white space separated list of modules)
     95# (white space separated list of modules or "all" for maximum cloning capability)
    11296#
    113 mondo_additional_modules=""
     97mondo_additional_modules="all"
    11498
    11599#
  • branches/stable/mondo/src/common/libmondo-archive-EXT.h

    r1594 r1639  
    2222extern int _move_files_to_stream(struct s_bkpinfo *bkpinfo,
    2323                                 char *files_to_add, ...);
    24 extern int offer_to_write_boot_floppies_to_physical_disks(struct s_bkpinfo
    25                                                           *bkpinfo);
    2624extern void pause_and_ask_for_cdr(int);
    2725extern int slice_up_file_etc(struct s_bkpinfo *bkpinfo,
  • branches/stable/mondo/src/common/libmondo-archive.c

    r1638 r1639  
    5858#endif                          /* __FreeBSD__ */
    5959
    60 extern struct mr_conf *mr_conf;
     60extern struct mr_ar_conf *mr_conf;
    6161
    6262/*@unused@*/
     
    534534    char *tmp = NULL;
    535535    char *command = NULL;
    536     char *use_lzo_sz = NULL;
    537     char *use_gzip_sz = NULL;
    538     char *use_comp_sz = NULL;
    539     char *use_star_sz = NULL;
    540536    char *bootldr_str = NULL;
    541537    char *tape_device = NULL;
     
    601597    /* BERLIOS: This parameter is not used after? */
    602598    mr_free(tape_size_sz);
    603     if (bkpinfo->use_lzo) {
    604         mr_asprintf(&use_lzo_sz, "yes");
    605     } else {
    606         mr_asprintf(&use_lzo_sz, "no");
    607     }
    608     if (bkpinfo->use_gzip) {
    609         mr_asprintf(&use_gzip_sz, "yes");
    610     } else {
    611         mr_asprintf(&use_gzip_sz, "no");
    612     }
    613     if (bkpinfo->use_star) {
    614         mr_asprintf(&use_star_sz, "yes");
    615     } else {
    616         mr_asprintf(&use_star_sz, "no");
    617     }
    618 
    619     if (bkpinfo->compression_level > 0) {
    620         mr_asprintf(&use_comp_sz, "yes");
    621     } else {
    622         mr_asprintf(&use_comp_sz, "no");
    623     }
    624599
    625600    mr_asprintf(&broken_bios_sz, "yes");    /* assume so */
     
    628603    } else {
    629604        mr_asprintf(&cd_recovery_sz, "no");
    630     }
    631     /* Field shared between LILO/ELILO */
    632     if (bkpinfo->make_cd_use_lilo) {
    633         mr_asprintf(&use_lilo_sz, "yes");
    634     } else {
    635         mr_asprintf(&use_lilo_sz, "no");
    636605    }
    637606
     
    896865    }
    897866    if (bkpinfo->differential) {
    898         mr_fprintf(fd1, "differential=1\n");
    899     } else {
    900         mr_fprintf(fd1, "differential=0\n");
     867        mr_fprintf(fd1, "differential=yes\n");
     868    } else {
     869        mr_fprintf(fd1, "differential=no\n");
    901870    }
    902871
     
    15691538 * - @c call_burn_iso
    15701539 * - @c call_make_iso
    1571  * - @c make_cd_use_lilo
    15721540 * - @c manual_tray
    15731541 * - @c nonbootable_backup
  • branches/stable/mondo/src/common/libmondo-archive.h

    r1594 r1639  
    2424int _move_files_to_stream(struct s_bkpinfo *bkpinfo, char *files_to_add,
    2525                          ...);
    26 int offer_to_write_boot_floppies_to_physical_disks(struct s_bkpinfo
    27                                                    *bkpinfo);
    2826void pause_and_ask_for_cdr(int);
    2927void set_bit_N_of_array(char *array, int N, bool true_or_false);
     
    3432int verify_data(struct s_bkpinfo *bkpinfo);
    3533void wipe_archives(char *d);
    36 int write_image_to_floppy(char *device, char *datafile);
    37 int write_image_to_floppy_SUB(char *device, char *datafile);
    3834int write_iso_and_go_on(struct s_bkpinfo *bkpinfo, bool last_cd);
    3935int write_final_iso_if_necessary(struct s_bkpinfo *bkpinfo);
  • branches/stable/mondo/src/common/libmondo-filelist.c

    r1627 r1639  
    4141
    4242int mondo_makefilelist(char *logfile, char *tmpdir, char *scratchdir,
    43                        char *include_paths, char *excp, int differential,
     43                       char *include_paths, char *excp, bool differential,
    4444                       char *userdef_filelist);
    4545
     
    15121512 */
    15131513int mondo_makefilelist(char *logfile, char *tmpdir, char *scratchdir,
    1514                        char *include_paths, char *excp, int differential,
     1514                       char *include_paths, char *excp, bool differential,
    15151515                       char *userdef_filelist)
    15161516{
     
    15471547    make_hole_for_file(sz_filelist);
    15481548
    1549     if (differential == 0) {
     1549    if (! differential) {
    15501550        // restore last good datefile if it exists
    15511551        mr_asprintf(&command, "cp -f %s.aborted %s", sz_datefile,
     
    15681568        mr_msg(2,
    15691569                "Warning - unable to find date of previous backup. Full backup instead.");
    1570         differential = 0;
     1570        differential = FALSE;
    15711571        time_of_last_full_backup = 0;
    15721572    } else {
  • branches/stable/mondo/src/common/libmondo-stream.c

    r1638 r1639  
    4040extern char *MONDO_LOGFILE;
    4141
    42 extern struct mr_conf *mr_conf;
     42extern struct mr_ar_conf *mr_conf;
    4343
    4444/**
     
    11061106    }
    11071107    if ((g_tape_posK + length_of_incoming_file / 1024) >> 10 >=
    1108         mediasize - (SLICE_SIZE * 4 / 1024)) {
     1108        mediasize - 16) { /* 4096(old SLICE_SIZE) * 4 / 1024) */
    11091109        log_it("g_tape_posK = %ld\nmediasize = %ld\n", g_tape_posK,
    11101110               mediasize);
  • branches/stable/mondo/src/common/libmondo-tools.c

    r1638 r1639  
    743743    bkpinfo->differential = FALSE;
    744744    bkpinfo->writer_speed = mr_conf->iso_burning_speed;
    745 // patch by Herman Kuster 
    746     bkpinfo->differential = 0;
    747 // patch end
    748745    bkpinfo->compression_level = 3;
    749746}
  • branches/stable/mondo/src/common/mondostructures.h

    r1628 r1639  
    553553    bool wipe_media_first;
    554554
    555 // patch by Herman Kuster 
    556   /**
    557    * The differential level of this backup. Currently only 0 (full backup) and 1
     555  /**
     556   * The differential level of this backup. Currently only FALSE (full backup) and TRUE
    558557   * (files changed since last full backup) are supported.
    559558   */
    560     int differential;
    561 // end patch 
     559    bool differential;
    562560
    563561  /**
  • branches/stable/mondo/src/include/mr_conf.h

    r1594 r1639  
    4747    /* Internal tape blocksize */
    4848    int internal_tape_blocksize;
    49     /* Size in MB of the slices for biggiefiles */
    50     int slice_size;
    51     /* deplist file used */
    52     char *deplist_file;
    53     /* Write boot floppies ? */
    54     bool write_boot_floppy;
    5549    /* Create mindi CD ? */
    5650    bool create_mindi_cd;
     
    10195    /* Internal tape blocksize */
    10296    int internal_tape_blocksize;
    103     /* Size in MB of the slices for biggiefiles */
    104     int slice_size;
    10597    /* Boot loader to use */
    10698    char *boot_loader;
  • branches/stable/mondo/src/include/my-stuff.h

    r1638 r1639  
    146146#define BLK_END_OF_BACKUP       101 ///< Marker block: end of backup.
    147147#define BLK_ABORTED_BACKUP      102 ///< Marker block: backup was aborted.
    148 
    149 #define SLICE_SIZE 4096         ///< The size of a slice of a biggiefile.
    150148
    151149/**
  • branches/stable/mondo/src/mondoarchive/mondo-cli.c

    r1638 r1639  
    580580
    581581    if (flag_set['D']) {
    582         bkpinfo->differential = 1;
    583 //      bkpinfo->differential = atoi (flag_val['D']);
    584         if ((bkpinfo->differential < 1) || (bkpinfo->differential > 9)) {
    585             fatal_error
    586                 ("The D option should be between 1 and 9 inclusive");
    587         }
     582        bkpinfo->differential = TRUE;
    588583    }
    589584
  • branches/stable/mondo/src/mondoarchive/mondoarchive.c

    r1625 r1639  
    151151    mr_cnf->external_tape_blocksize = 0;
    152152    mr_cnf->internal_tape_blocksize = 0;
    153     mr_cnf->slice_size = 0;
    154     mr_cnf->deplist_file = NULL;
    155153    mr_cnf->create_mindi_cd = FALSE;
    156154    mr_cnf->kernel = NULL;
     
    256254    }
    257255
    258     p = mr_conf_iread("mondo_slice_size");
    259     if (p != NULL) {
    260         mr_cnf->slice_size = atoi(p);
    261         mr_free(p);
    262     }
    263 
    264     p = mr_conf_sread("mondo_deplist_file");
    265     if (p != NULL) {
    266         mr_cnf->deplist_file = p;
    267     }
    268 
    269256    p = mr_conf_bread("mondo_create_mindi_cd");
    270257    if (p != NULL) {
     
    356343    mr_free(mr_cnf->media_device);
    357344    mr_free(mr_cnf->prefix);
    358     mr_free(mr_cnf->deplist_file);
    359345    mr_free(mr_cnf->kernel);
    360346    mr_free(mr_cnf->additional_modules);
  • branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c

    r1638 r1639  
    20482048 * @return 0 for success, nonzero for failure.
    20492049 */
    2050 int extract_cfg_file_and_mountlist_from_tape_dev(char *dev)
     2050int extract_cfg_file_and_mountlist_from_tape_dev(struct s_bkpinfo  *bkpinfo)
    20512051{
    20522052    char *command = NULL;
    20532053    int res = 0;
    20542054    // BERLIOS: below 32KB seems to block at least on RHAS 2.1 and MDK 10.0
    2055     long tape_block_size = 32768;
    20562055
    20572056    // tar -zxvf-
    20582057    mr_asprintf(&command,
    20592058            "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx %s %s %s %s %s",
    2060             dev,
    2061             tape_block_size,
    2062             1024L * 1024 * 32 / tape_block_size,
     2059            bkpinfo->media_device,
     2060            bkpinfo->internal_tape_block_size,
     2061            1024L * 1024 * 32 / bkpinfo->internal_tape_block_size,
    20632062            MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB,
    20642063            BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "tmp/i-want-my-lvm");
     
    21482147                        bkpinfo->media_device);
    21492148            }
     2149            /* extract_cfg_file_and_mountlist_from_tape_dev needs
     2150             * the internal block size to be setup */
     2151            if (bkpinfo->internal_tape_blocksize == 0) {
     2152                /* Guessing a value */
     2153                bkpinfo->internal_tape_blocksize = 32768;
     2154            }
    21502155            mr_asprintf(&tmp, bkpinfo->media_device);
    21512156            if (extract_cfg_file_and_mountlist_from_tape_dev
    2152                 (bkpinfo->media_device)) {
     2157                (bkpinfo)) {
    21532158                mr_allocstr(bkpinfo->media_device, "/dev/st0");
    21542159                if (extract_cfg_file_and_mountlist_from_tape_dev
    2155                     (bkpinfo->media_device)) {
     2160                    (bkpinfo)) {
    21562161                    mr_allocstr(bkpinfo->media_device, "/dev/osst0");
    21572162                    if (extract_cfg_file_and_mountlist_from_tape_dev
    2158                         (bkpinfo->media_device)) {
     2163                        (bkpinfo)) {
    21592164                        mr_allocstr(bkpinfo->media_device, "/dev/ht0");
    21602165                        if (extract_cfg_file_and_mountlist_from_tape_dev
    2161                             (bkpinfo->media_device)) {
     2166                            (bkpinfo)) {
    21622167                            mr_msg(3,
    21632168                                    "I tried lots of devices but none worked.");
  • branches/stable/mondo/src/mondorestore/mondorestore.c

    r1638 r1639  
    179179    mr_cnf->external_tape_blocksize = 0;
    180180    mr_cnf->internal_tape_blocksize = 0;
    181     mr_cnf->slice_size = 0;
    182181    mr_cnf->boot_loader = NULL;
    183182    mr_cnf->differential = FALSE;
  • branches/stable/pbconf/mondo/pbfilter/mandriva.pbf

    r1637 r1639  
    55#
    66# PBSRC is replaced by the source package format
    7 filter PBSRC = ftp://ftp.mondorescue.org/src/%{name}-%{version}.tar.bz2
     7filter PBSRC = ftp://ftp.mondorescue.org/src/%{name}-%{version}.tar.gz
    88
    99# PBGRP is replaced by the RPM group of apps
Note: See TracChangeset for help on using the changeset viewer.