Changeset 3138 in MondoRescue for branches/3.0

Timestamp:

Jun 13, 2013, 6:37:24 AM (11 years ago)

Author:

Bruno Cornec

Message:

r5337@localhost: bruno | 2013-06-13 01:56:06 +0200

• Attempt to realize #700 by adding a CLI parameter to modify the biggie file size limit. By default 64 MB.
• Also with previous commit, fixes #700 by using blocks, and adapting autoconf to use it as well.

Location:

branches/3.0

Files:

• mondo-doc/Makefile.howto (modified) (1 diff)
• mondo-doc/mondoarchive.8 (modified) (2 diffs)
• mondo/configure.in (modified) (1 diff)
• mondo/src/common/libmondo-cli.c (modified) (2 diffs)
• mondo/src/common/libmondo-filelist.c (modified) (3 diffs)
• mondo/src/include/my-stuff.h (modified) (1 diff)
• mondo/src/mondoarchive/mondoarchive.h (modified) (1 diff)

branches/3.0/mondo-doc/Makefile.howto

@@ -45 +45 @@
     @echo "Generating doc in PDF format"
     @echo "----------------------------"
+    @ln -s /var/lib/texmf/web2c/pdfetex/pdfjadetex.fmt .
     @docbook2pdf -d $(TARGET).dsl'#pdf' $(TARGET).sgml
 

branches/3.0/mondo-doc/mondoarchive.8

@@ -273 +273 @@
 
 .TP
+.BI "\-G "
+Use gzip, the standard and quicker Linux compression engine, instead of bzip2.
+
+.TP
 .BI "\-H "
 When you boot from the tape/CD, your hard drive will be wiped and the archives
@@ -285 +289 @@
 
 .TP
-.BI "\-G "
-Use gzip, the standard and quicker Linux compression engine, instead of bzip2.
+.BI "\-M " "max-size"
+Gives the maximum size of a biggie file (by default 64 MB). The value should 
+be given in kB. Example use \-M 128000 to have biggie being more than 128 MB.
 
 .TP
 .BI "\-R "
-EXPERIMENTAL. Do not use in mission-critical environments. Star is an
-alternative to afio. Mondo now supports POSIX ACLs and extended
-attributes, so \-R is essentially redundant for now.
+Star is an alternative to afio. Can be useful for distributions considering
+that afio is not free enough due to its age and old licenses (wrongly in our
+opinion). Star can be used to have a better support of sparse file compared to
+afio. Also star supports natively POSIX ACLs, where as afio requires a special 
+additional handlling.
 
 .TP

branches/3.0/mondo/configure.in

@@ -122 +122 @@
 AC_TYPE_SIZE_T
 AC_TYPE_SSIZE_T
+AC_STRUCT_ST_BLOCKS
 
 # Checks for library functions.

branches/3.0/mondo/src/common/libmondo-cli.c

@@ -53 +53 @@
 
 extern void free_MR_global_filenames(void);
+
+long g_max_biggie_size = BIGGIEMAXSIZE;
 
 /**
@@ -670 +672 @@
     if (flag_set['e']) {
         bkpinfo->please_dont_eject = TRUE;
+    }
+
+    if (flag_set['M']) {
+        g_max_biggie_size = atol(flag_val['M']);
+        log_msg(1, "Max size for biggie file is now %ld KB", g_max_biggie_size);
     }
 

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

@@ -32 +32 @@
 extern char *MONDO_LOGFILE;
 
+extern long g_max_biggie_size;
+
 /* Reference to global bkpinfo */
 extern struct s_bkpinfo *bkpinfo;
@@ -199 +201 @@
     long lino = 0;
     // A big file has more than 64 MB of real content
-    long max_sane_size_for_a_file = 64L * 1024L;
     long curr_set_size;
     long noof_lines;
@@ -274 +275 @@
             siz = (long) ((buf.st_blocks*512) >> 10);
         }
-        if (siz > max_sane_size_for_a_file) {
+        if (siz > g_max_biggie_size) {
             log_msg(10, "Adding %s to big files\n", incoming);
             fprintf(fbig, "%s\n", incoming);

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

@@ -329 +329 @@
 #define ACL_BIGGLST_FNAME_RAW_SZ     "%s/acl_list.big.gz"
 
+#define BIGGIEMAXSIZE           64L*1024L
 /**
  * The template for an afioball filename.

branches/3.0/mondo/src/mondoarchive/mondoarchive.h

@@ -9 +9 @@
  */
 char *MONDO_LOGFILE = "/var/log/mondoarchive.log";
-char *MONDO_OPTIONS = "0123456789A:B:C:DE:GHI:J:K:LNOP:QRS:T:UVWb:c:d:ef:gik:l:mn:op:rs:tuw:x:z";
+char *MONDO_OPTIONS = "0123456789A:B:C:DE:GHI:J:K:LMNOP:QRS:T:UVWb:c:d:ef:gik:l:mn:op:rs:tuw:x:z";
 
 /* No restriction on ps options */