Changeset 1639 in MondoRescue for branches/stable

Timestamp:

Sep 20, 2007, 10:20:45 PM (17 years ago)

Author:

Bruno Cornec

Message:

More conf file items handled

Location:

branches/stable

Files:

• mondo/distributions/conf/mondo.conf.dist (modified) (2 diffs)
• mondo/src/common/libmondo-archive-EXT.h (modified) (1 diff)
• mondo/src/common/libmondo-archive.c (modified) (6 diffs)
• mondo/src/common/libmondo-archive.h (modified) (2 diffs)
• mondo/src/common/libmondo-filelist.c (modified) (4 diffs)
• mondo/src/common/libmondo-stream.c (modified) (2 diffs)
• mondo/src/common/libmondo-tools.c (modified) (1 diff)
• mondo/src/common/mondostructures.h (modified) (1 diff)
• mondo/src/include/mr_conf.h (modified) (2 diffs)
• mondo/src/include/my-stuff.h (modified) (1 diff)
• mondo/src/mondoarchive/mondo-cli.c (modified) (1 diff)
• mondo/src/mondoarchive/mondoarchive.c (modified) (3 diffs)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (2 diffs)
• mondo/src/mondorestore/mondorestore.c (modified) (1 diff)
• pbconf/mondo/pbfilter/mandriva.pbf (modified) (1 diff)

branches/stable/mondo/distributions/conf/mondo.conf.dist

@@ -81 +81 @@
 
 #
-# Size in MB of the slices for biggiefiles
-#
-mondo_slice_size=4096
-
-#
-# deplist file used (either fill path or relative to 
-# mondo's configuration dir
-#
-mondo_deplist_file="deplist.txt"
-
-#
-# Write boot floppies (yes|no) ?
-#
-mondo_write_boot_floppy=no
-
-#
 # Create mindi CD (yes|no) ?
 #
@@ -109 +93 @@
 #
 # Additional modules to support 
-# (white space separated list of modules)
+# (white space separated list of modules or "all" for maximum cloning capability)
 #
-mondo_additional_modules=""
+mondo_additional_modules="all"
 
 #

branches/stable/mondo/src/common/libmondo-archive-EXT.h

@@ -22 +22 @@
 extern int _move_files_to_stream(struct s_bkpinfo *bkpinfo,
                                  char *files_to_add, ...);
-extern int offer_to_write_boot_floppies_to_physical_disks(struct s_bkpinfo
-                                                          *bkpinfo);
 extern void pause_and_ask_for_cdr(int);
 extern int slice_up_file_etc(struct s_bkpinfo *bkpinfo,

branches/stable/mondo/src/common/libmondo-archive.c

@@ -58 +58 @@
 #endif                          /* __FreeBSD__ */
 
-extern struct mr_conf *mr_conf;
+extern struct mr_ar_conf *mr_conf;
 
 /*@unused@*/
@@ -534 +534 @@
     char *tmp = NULL;
     char *command = NULL;
-    char *use_lzo_sz = NULL;
-    char *use_gzip_sz = NULL;
-    char *use_comp_sz = NULL;
-    char *use_star_sz = NULL;
     char *bootldr_str = NULL;
     char *tape_device = NULL;
@@ -601 +597 @@
     /* BERLIOS: This parameter is not used after? */
     mr_free(tape_size_sz);
-    if (bkpinfo->use_lzo) {
-        mr_asprintf(&use_lzo_sz, "yes");
-    } else {
-        mr_asprintf(&use_lzo_sz, "no");
-    }
-    if (bkpinfo->use_gzip) {
-        mr_asprintf(&use_gzip_sz, "yes");
-    } else {
-        mr_asprintf(&use_gzip_sz, "no");
-    }
-    if (bkpinfo->use_star) {
-        mr_asprintf(&use_star_sz, "yes");
-    } else {
-        mr_asprintf(&use_star_sz, "no");
-    }
-
-    if (bkpinfo->compression_level > 0) {
-        mr_asprintf(&use_comp_sz, "yes");
-    } else {
-        mr_asprintf(&use_comp_sz, "no");
-    }
 
     mr_asprintf(&broken_bios_sz, "yes");    /* assume so */
@@ -628 +603 @@
     } else {
         mr_asprintf(&cd_recovery_sz, "no");
-    }
-    /* Field shared between LILO/ELILO */
-    if (bkpinfo->make_cd_use_lilo) {
-        mr_asprintf(&use_lilo_sz, "yes");
-    } else {
-        mr_asprintf(&use_lilo_sz, "no");
     }
 
@@ -896 +865 @@
     }
     if (bkpinfo->differential) {
-        mr_fprintf(fd1, "differential=1\n");
-    } else {
-        mr_fprintf(fd1, "differential=0\n");
+        mr_fprintf(fd1, "differential=yes\n");
+    } else {
+        mr_fprintf(fd1, "differential=no\n");
     }
 
@@ -1569 +1538 @@
  * - @c call_burn_iso
  * - @c call_make_iso
- * - @c make_cd_use_lilo
  * - @c manual_tray
  * - @c nonbootable_backup

branches/stable/mondo/src/common/libmondo-archive.h

@@ -24 +24 @@
 int _move_files_to_stream(struct s_bkpinfo *bkpinfo, char *files_to_add,
                           ...);
-int offer_to_write_boot_floppies_to_physical_disks(struct s_bkpinfo
-                                                   *bkpinfo);
 void pause_and_ask_for_cdr(int);
 void set_bit_N_of_array(char *array, int N, bool true_or_false);
@@ -34 +32 @@
 int verify_data(struct s_bkpinfo *bkpinfo);
 void wipe_archives(char *d);
-int write_image_to_floppy(char *device, char *datafile);
-int write_image_to_floppy_SUB(char *device, char *datafile);
 int write_iso_and_go_on(struct s_bkpinfo *bkpinfo, bool last_cd);
 int write_final_iso_if_necessary(struct s_bkpinfo *bkpinfo);

branches/stable/mondo/src/common/libmondo-filelist.c

@@ -41 +41 @@
 
 int mondo_makefilelist(char *logfile, char *tmpdir, char *scratchdir,
-                       char *include_paths, char *excp, int differential,
+                       char *include_paths, char *excp, bool differential,
                        char *userdef_filelist);
 
@@ -1512 +1512 @@
  */
 int mondo_makefilelist(char *logfile, char *tmpdir, char *scratchdir,
-                       char *include_paths, char *excp, int differential,
+                       char *include_paths, char *excp, bool differential,
                        char *userdef_filelist)
 {
@@ -1547 +1547 @@
     make_hole_for_file(sz_filelist);
 
-    if (differential == 0) {
+    if (! differential) {
         // restore last good datefile if it exists
         mr_asprintf(&command, "cp -f %s.aborted %s", sz_datefile,
@@ -1568 +1568 @@
         mr_msg(2,
                 "Warning - unable to find date of previous backup. Full backup instead.");
-        differential = 0;
+        differential = FALSE;
         time_of_last_full_backup = 0;
     } else {

branches/stable/mondo/src/common/libmondo-stream.c

@@ -40 +40 @@
 extern char *MONDO_LOGFILE;
 
-extern struct mr_conf *mr_conf;
+extern struct mr_ar_conf *mr_conf;
 
 /**
@@ -1106 +1106 @@
     }
     if ((g_tape_posK + length_of_incoming_file / 1024) >> 10 >=
-        mediasize - (SLICE_SIZE * 4 / 1024)) {
+        mediasize - 16) { /* 4096(old SLICE_SIZE) * 4 / 1024) */
         log_it("g_tape_posK = %ld\nmediasize = %ld\n", g_tape_posK,
                mediasize);

branches/stable/mondo/src/common/libmondo-tools.c

@@ -743 +743 @@
     bkpinfo->differential = FALSE;
     bkpinfo->writer_speed = mr_conf->iso_burning_speed;
-// patch by Herman Kuster  
-    bkpinfo->differential = 0;
-// patch end
     bkpinfo->compression_level = 3;
 }

branches/stable/mondo/src/common/mondostructures.h

@@ -553 +553 @@
     bool wipe_media_first;
 
-// patch by Herman Kuster  
-  /**
-   * The differential level of this backup. Currently only 0 (full backup) and 1
+  /**
+   * The differential level of this backup. Currently only FALSE (full backup) and TRUE
    * (files changed since last full backup) are supported.
    */
-    int differential;
-// end patch  
+    bool differential;
 
   /**

branches/stable/mondo/src/include/mr_conf.h

@@ -47 +47 @@
     /* Internal tape blocksize */
     int internal_tape_blocksize;
-    /* Size in MB of the slices for biggiefiles */
-    int slice_size;
-    /* deplist file used */
-    char *deplist_file;
-    /* Write boot floppies ? */
-    bool write_boot_floppy;
     /* Create mindi CD ? */
     bool create_mindi_cd;
@@ -101 +95 @@
     /* Internal tape blocksize */
     int internal_tape_blocksize;
-    /* Size in MB of the slices for biggiefiles */
-    int slice_size;
     /* Boot loader to use */
     char *boot_loader;

branches/stable/mondo/src/include/my-stuff.h

@@ -146 +146 @@
 #define BLK_END_OF_BACKUP       101 ///< Marker block: end of backup.
 #define BLK_ABORTED_BACKUP      102 ///< Marker block: backup was aborted.
-
-#define SLICE_SIZE 4096         ///< The size of a slice of a biggiefile.
 
 /**

branches/stable/mondo/src/mondoarchive/mondo-cli.c

@@ -580 +580 @@
 
     if (flag_set['D']) {
-        bkpinfo->differential = 1;
-//      bkpinfo->differential = atoi (flag_val['D']);
-        if ((bkpinfo->differential < 1) || (bkpinfo->differential > 9)) {
-            fatal_error
-                ("The D option should be between 1 and 9 inclusive");
-        }
+        bkpinfo->differential = TRUE;
     }
 

branches/stable/mondo/src/mondoarchive/mondoarchive.c

@@ -151 +151 @@
     mr_cnf->external_tape_blocksize = 0;
     mr_cnf->internal_tape_blocksize = 0;
-    mr_cnf->slice_size = 0;
-    mr_cnf->deplist_file = NULL;
     mr_cnf->create_mindi_cd = FALSE;
     mr_cnf->kernel = NULL;
@@ -256 +254 @@
     }
 
-    p = mr_conf_iread("mondo_slice_size");
-    if (p != NULL) {
-        mr_cnf->slice_size = atoi(p);
-        mr_free(p);
-    }
-
-    p = mr_conf_sread("mondo_deplist_file");
-    if (p != NULL) {
-        mr_cnf->deplist_file = p;
-    }
-
     p = mr_conf_bread("mondo_create_mindi_cd");
     if (p != NULL) {
@@ -356 +343 @@
     mr_free(mr_cnf->media_device);
     mr_free(mr_cnf->prefix);
-    mr_free(mr_cnf->deplist_file);
     mr_free(mr_cnf->kernel);
     mr_free(mr_cnf->additional_modules);

branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -2048 +2048 @@
  * @return 0 for success, nonzero for failure.
  */
-int extract_cfg_file_and_mountlist_from_tape_dev(char *dev)
+int extract_cfg_file_and_mountlist_from_tape_dev(struct s_bkpinfo  *bkpinfo)
 {
     char *command = NULL;
     int res = 0;
     // BERLIOS: below 32KB seems to block at least on RHAS 2.1 and MDK 10.0
-    long tape_block_size = 32768;
 
     // tar -zxvf-
     mr_asprintf(&command,
             "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx %s %s %s %s %s",
-            dev,
-            tape_block_size,
-            1024L * 1024 * 32 / tape_block_size,
+            bkpinfo->media_device,
+            bkpinfo->internal_tape_block_size,
+            1024L * 1024 * 32 / bkpinfo->internal_tape_block_size,
             MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB,
             BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "tmp/i-want-my-lvm");
@@ -2148 +2147 @@
                         bkpinfo->media_device);
             }
+            /* extract_cfg_file_and_mountlist_from_tape_dev needs 
+             * the internal block size to be setup */
+            if (bkpinfo->internal_tape_blocksize == 0) {
+                /* Guessing a value */
+                bkpinfo->internal_tape_blocksize = 32768;
+            }
             mr_asprintf(&tmp, bkpinfo->media_device);
             if (extract_cfg_file_and_mountlist_from_tape_dev
-                (bkpinfo->media_device)) {
+                (bkpinfo)) {
                 mr_allocstr(bkpinfo->media_device, "/dev/st0");
                 if (extract_cfg_file_and_mountlist_from_tape_dev
-                    (bkpinfo->media_device)) {
+                    (bkpinfo)) {
                     mr_allocstr(bkpinfo->media_device, "/dev/osst0");
                     if (extract_cfg_file_and_mountlist_from_tape_dev
-                        (bkpinfo->media_device)) {
+                        (bkpinfo)) {
                         mr_allocstr(bkpinfo->media_device, "/dev/ht0");
                         if (extract_cfg_file_and_mountlist_from_tape_dev
-                            (bkpinfo->media_device)) {
+                            (bkpinfo)) {
                             mr_msg(3,
                                     "I tried lots of devices but none worked.");

branches/stable/mondo/src/mondorestore/mondorestore.c

@@ -179 +179 @@
     mr_cnf->external_tape_blocksize = 0;
     mr_cnf->internal_tape_blocksize = 0;
-    mr_cnf->slice_size = 0;
     mr_cnf->boot_loader = NULL;
     mr_cnf->differential = FALSE;

branches/stable/pbconf/mondo/pbfilter/mandriva.pbf

@@ -5 +5 @@
 #
 # PBSRC is replaced by the source package format
-filter PBSRC = ftp://ftp.mondorescue.org/src/%{name}-%{version}.tar.bz2
+filter PBSRC = ftp://ftp.mondorescue.org/src/%{name}-%{version}.tar.gz
 
 # PBGRP is replaced by the RPM group of apps