Changeset 1043 in MondoRescue for trunk/mondo/src

Timestamp:

Jan 8, 2007, 11:31:22 PM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r978:1042 $SVN_M/branches/stable

Location:

trunk/mondo/src

Files:

• common/libmondo-archive.c (modified) (5 diffs)
• common/libmondo-filelist.c (modified) (2 diffs)
• common/libmondo-files.c (modified) (1 diff)
• common/libmondo-tools.c (modified) (3 diffs)
• common/libmondo-verify.c (modified) (3 diffs)
• common/mondostructures.h (modified) (1 diff)
• mondoarchive/mondo-cli.c (modified) (2 diffs)
• mondorestore/mondo-restore.c (modified) (4 diffs)
• mondorestore/mondo-rstr-compare.c (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (1 diff)
• restore-scripts/mondo/hack-fstab (modified) (3 diffs)
• restore-scripts/mondo/restore-bigfiles-from-iso (modified) (1 diff)
• restore-scripts/mondo/stabgrub-me (modified) (1 diff)

trunk/mondo/src/common/libmondo-archive.c

@@ -546 +546 @@
     char *command = NULL;
     char *use_lzo_sz = NULL;
+    char *use_gzip_sz = NULL;
     char *use_comp_sz = NULL;
     char *use_star_sz = NULL;
@@ -607 +608 @@
     } 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) {
@@ -861 +867 @@
              "mindi --custom %s %s/images '%s' '%s' \
 '%s' %ld '%s' '%s' '%s' \
-'%s' %s %ld '%s' '%s' '%s' '%s' %ld %d %s", bkpinfo->tmpdir,    // parameter #2
+'%s' %s %ld '%s' '%s' '%s' '%s' %ld %d '%s'", bkpinfo->tmpdir,  // parameter #2
              bkpinfo->scratchdir,   // parameter #3
              bkpinfo->kernel_path,  // parameter #4
@@ -879 +885 @@
              bkpinfo->internal_tape_block_size, // parameter #18 (LONG)
              bkpinfo->differential, // parameter #19 (INT)
+             use_gzip_sz,       // parameter #20 (STRING)
              tmp);
     mr_free(tmp);
@@ -891 +898 @@
     mr_free(devs_to_exclude);
     mr_free(use_lilo_sz);
+    mr_free(use_gzip_sz);
 
     log_msg(2, command);

trunk/mondo/src/common/libmondo-filelist.c

@@ -428 +428 @@
     char *syscall;
     char *file_to_analyze = NULL;
+    char *strtmp = NULL;
     int i;
     size_t n = 0;
@@ -452 +453 @@
         log_msg(8, "Analyzing %s", file_to_analyze);
         /* BERLIOS : to be checked */
-        mr_asprintf(&syscall, "%s %s 2>> /dev/null", syscall_sprintf,mr_stresc(file_to_analyze, "`$\\\"", '\\'));
+        mr_asprintf(&strtmp, syscall_sprintf, mr_stresc(file_to_analyze, "`$\\\"", '\\'));
+        mr_asprintf(&syscall, "%s 2>> /dev/null", strtmp);
+        paranoid_free(strtmp);
         call_exe_and_pipe_output_to_fd(syscall, pout);
         mr_free(syscall);

trunk/mondo/src/common/libmondo-files.c

@@ -1205 +1205 @@
     if (bkpinfo->use_lzo) {
         scratchLL = (scratchLL * 2) / 3;
+    } else if (bkpinfo->use_gzip) {
+        scratchLL = (scratchLL * 2) / 3;
     } else {
         scratchLL = scratchLL / 2;

trunk/mondo/src/common/libmondo-tools.c

@@ -431 +431 @@
         mr_allocstr(bkpinfo->zip_exe, "lzop");
         mr_allocstr(bkpinfo->zip_suffix, "lzo");
+    } else if (bkpinfo->use_gzip) {
+        strcpy(bkpinfo->zip_exe, "gzip");
+        strcpy(bkpinfo->zip_suffix, "gz");
+    } else if (bkpinfo->use_gzip) {
+        strcpy(bkpinfo->zip_exe, "gzip");
+        strcpy(bkpinfo->zip_suffix, "gz");
     } else if (bkpinfo->compression_level != 0) {
         mr_allocstr(bkpinfo->zip_exe, "bzip2");
@@ -753 +759 @@
     mr_free(bkpinfo->restore_path);
     bkpinfo->use_lzo = FALSE;
+    bkpinfo->use_gzip = FALSE;
+    bkpinfo->do_not_compress_these[0] = '\0';
     bkpinfo->verify_data = FALSE;
     bkpinfo->backup_data = FALSE;
@@ -909 +917 @@
     }
     retval += whine_if_not_found("bzip2");
+    retval += whine_if_not_found("gzip");
     retval += whine_if_not_found("awk");
     retval += whine_if_not_found("md5sum");

trunk/mondo/src/common/libmondo-verify.c

@@ -238 +238 @@
         if (bkpinfo->use_lzo) {
             mr_asprintf(&sz_exe, "lzop");
+        else if (bkpinfo->use_gzip) {
+            strcpy(sz_exe, "gzip");
+        } else if (bkpinfo->use_gzip) {
+            strcpy(sz_exe, "gzip");
         } else {
             mr_asprintf(&sz_exe, "bzip2");
@@ -409 +413 @@
         mr_allocstr(bkpinfo->zip_suffix, "lzo");
         bkpinfo->use_lzo = TRUE;
+        bkpinfo->use_gzip = FALSE;
+    }
+    if (strstr(tarball_fname, ".gz")
+        && strcmp(bkpinfo->zip_suffix, "gz")) {
+        log_msg(2, "OK, I'm going to start using gzip.");
+        strcpy(bkpinfo->zip_exe, "gzip");
+        strcpy(bkpinfo->zip_suffix, "gz");
+        bkpinfo->use_lzo = FALSE;
+        bkpinfo->use_gzip = TRUE;
     }
     if (strstr(tarball_fname, ".bz2")
@@ -416 +429 @@
         mr_allocstr(bkpinfo->zip_suffix, "bz2");
         bkpinfo->use_lzo = FALSE;
+        bkpinfo->use_gzip = FALSE;
     }
     unlink(outlog);

trunk/mondo/src/common/mondostructures.h

@@ -387 +387 @@
    */
     bool use_lzo;
+
+  /**
+   * If TRUE, then use @c gzip to compress data.
+   * This is used mainly in estimates. The backup/restore may or may
+   * not work if you do not set this. You should also set @p zip_exe
+   * and @p zip_suffix.
+   */
+    bool use_gzip;
+
+  /**
+   * A filename containing a list of extensions, one per line, to not
+   * compress. If this is set to "", afio will still exclude a set of well-known
+   * compressed files from compression, but biggiefiles that are compressed
+   * will be recompressed again.
+   */
+    char do_not_compress_these[MAX_STR_LEN / 2];
 
   /**

trunk/mondo/src/mondoarchive/mondo-cli.c

@@ -799 +799 @@
     }
 
+    if (flag_set['G']) {
+        bkpinfo->use_gzip = TRUE;
+        if (run_program_and_log_output("which gzip", FALSE)) {
+            retval++;
+            log_to_screen
+                ("Please install gzip. You can't use '-G' until you do.\n");
+        }
+    }
+
     if (!flag_set['o']
         &&
@@ -893 +902 @@
     while ((opt =
             getopt(argc, argv,
-                   "0123456789A:B:C:DE:FHI:J:K:LNOP:QRS:T:VWb:c:d:ef:gik:l:mn:op:rs:tuw:x:z"))
+                   "0123456789A:B:C:DE:FGHI:J:K:LNOP:QRS:T:VWb:c:d:ef:gik:l:mn:op:rs:tuw:x:z"))
            != -1) {
         if (opt == '?') {

trunk/mondo/src/mondorestore/mondo-restore.c

@@ -1002 +1002 @@
     char *outfile_fname = NULL;
     char *tmp = NULL;
+    char *tmp0 = NULL;
     char *tmp1 = NULL;
     char *tmp2 = NULL;
@@ -1157 +1158 @@
     for (sliceno = 1, finished = FALSE; !finished;) {
         tmp = slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "");
+        tmp0 = slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "gz");
         tmp1 = slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "lzo");
         tmp2 = slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "bz2");
-        if (!does_file_exist(tmp) && !does_file_exist(tmp1) &&
+        if (!does_file_exist(tmp) && 
+            !does_file_exist(tmp0) &&
+            !does_file_exist(tmp1) &&
             !does_file_exist(tmp2)) {
             log_msg(3,
@@ -1190 +1194 @@
                 if (does_file_exist(tmp1)) {
                     mr_asprintf(&bzip2_command, "lzop -dc %s 2>> %s",tmp1, MONDO_LOGFILE);
+                } else if (does_file_exist(tmp0)) {
+                    mr_asprintf(&bzip2_command, "gzip -dc %s 2>> %s",tmp0, MONDO_LOGFILE);
                 } else if (does_file_exist(tmp2)) {
                         mr_asprintf(&bzip2_command, "bzip2 -dc %s 2>> %s",tmp2, MONDO_LOGFILE);
@@ -1616 +1622 @@
         if (strstr(tarball_fname, ".bz2")) {
             mr_asprintf(&executable, "bzip2");
+        } else if (strstr(tarball_fname, ".gz")) {
+            strcpy(executable, "gzip");
+        } else if (strstr(tarball_fname, ".gz")) {
+            strcpy(executable, "gzip");
         } else if (strstr(tarball_fname, ".lzo")) {
             mr_asprintf(&executable, "lzop");

trunk/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -241 +241 @@
     if (strstr(tarball_fname, ".bz2")) {
         mr_asprintf(&compressor_exe, "bzip2");
+    } else if (strstr(tarball_fname, ".gz")) {
+        strcpy(compressor_exe, "gzip");
+    } else if (strstr(tarball_fname, ".gz")) {
+        strcpy(compressor_exe, "gzip");
     } else if (strstr(tarball_fname, ".lzo")) {
         mr_asprintf(&compressor_exe, "lzop");

trunk/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -952 +952 @@
         mr_allocstr(bkpinfo->zip_exe, "lzop");
         mr_allocstr(bkpinfo->zip_suffix, "lzo");
+        bkpinfo->use_gzip = FALSE;
     } else {
         mr_free(value);
-        read_cfg_var(cfg_file, "use-comp", value);
+        read_cfg_var(cfg_file, "use-gzip", value);
         if (strstr(value, "yes")) {
             bkpinfo->use_lzo = FALSE;
-            mr_allocstr(bkpinfo->zip_exe, "bzip2");
-            mr_allocstr(bkpinfo->zip_suffix, "bz2");
+            bkpinfo->use_gzip = TRUE;
+            mr_allocstr(bkpinfo->zip_exe, "gzip");
+            mr_allocstr(bkpinfo->zip_suffix, "gz");
         } else {
-            // Just to be sure
-            bkpinfo->zip_exe = NULL;
-            bkpinfo->zip_suffix = NULL;
+            read_cfg_var(cfg_file, "use-comp", value);
+            if (strstr(value, "yes")) {
+                bkpinfo->use_lzo = FALSE;
+                bkpinfo->use_gzip = FALSE;
+                mr_allocstr(bkpinfo->zip_exe, "bzip2");
+                mr_allocstr(bkpinfo->zip_suffix, "bz2");
+            } else {
+                // Just to be sure
+                bkpinfo->zip_exe = NULL;
+                bkpinfo->zip_suffix = NULL;
+            }
         }
     }

trunk/mondo/src/restore-scripts/mondo/hack-fstab

@@ -1 +1 @@
 #!/bin/sh
 #
+# $Id$
 #
-#
-#
-#
-# 2003/08/04
-# - added some logging
-#
-# mid-2002 --- created
-################################################
-
 
 LogIt() {
     echo "$1" >> /dev/stderr
 }
-
-
 
 
@@ -33 +23 @@
 #    echo "original_fstab_line = $original_fstab_line" >> /dev/stderr
     if [ "`grep "LABEL=" $old_fstab`" != "" ] ; then
-    if [ "$format" = "ext2" ] || [ "$format" = "ext3" ] ; then
-        device="LABEL=$mountpoint"
-    fi
+        if [ "$format" = "ext2" ] || [ "$format" = "ext3" ] ; then
+            device="LABEL=$mountpoint"
+        fi
     fi
 
@@ -44 +34 @@
     if [ "$original_fstab_line" != "" ] ; then
 #   echo $original_fstab_line | gawk '{i=index($0,$4); print substr($0,i);}'
-    echo "$original_fstab_line" | cut -d' ' -f4-19 | tr -s ' ' ' '
+        echo "$original_fstab_line" | cut -d' ' -f4-19 | tr -s ' ' ' '
     else
-    echo -e "defaults 0 0"
+        echo -e "defaults 0 0"
     fi
 }
-
 
 

trunk/mondo/src/restore-scripts/mondo/restore-bigfiles-from-iso

@@ -63 +63 @@
             if echo "$slicename" | grep "bz2" > /dev/null ; then
                 bzip2 -dc $slicename >> "$OUTFNAME" || Die "Failed to decompress slice $slicename"
+            elif echo "$slicename" | grep "gz" > /dev/null ; then
+                gzip -dc $slicename >> "$OUTFNAME" || Die "Failed to decompress slice $slicename"
             elif echo "$slicename" | grep "lzo" > /dev/null ; then
                 lzop -dc $slicename >> "$OUTFNAME" || Die "Failed to decompress slice $slicename"

trunk/mondo/src/restore-scripts/mondo/stabgrub-me

@@ -32 +32 @@
         LogIt "No need for fstab search." 2
 #        fstab_list=/mnt/RESTORING/etc/fstab
-    old_fstab=/mnt/RESTORING/etc/fstab
-    old_grubconf=/mnt/RESTORING/etc/grub.conf
+        old_fstab=/mnt/RESTORING/etc/fstab
+        old_grubconf=/mnt/RESTORING/etc/grub.conf
         # For some distros, e.g. Debian, /etc/grub.conf is a symbolic link
-    # which we need to resolve and prepend with /mnt/RESTORING because
-    # we run this outside the chroot.
-    if [ -L "$old_grubconf" ] ; then
-        old_grubconf=/mnt/RESTORING`readlink "$old_grubconf"`
-    fi  
-    return 0
+        # which we need to resolve and prepend with /mnt/RESTORING because
+        # we run this outside the chroot.
+        if [ -L "$old_grubconf" ] ; then
+            old_grubconf=/mnt/RESTORING/etc/`readlink "$old_grubconf"`
+        fi  
+        return 0
     elif [ -f "/mnt/cdrom/archives/CUCKOO" ] ; then
         LogIt "Because I'm cuckoo, I'll stop searching." 2