Changeset 3353 in MondoRescue for branches

Timestamp:

Mar 3, 2015, 1:32:45 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Fix #748 by solving interface issues between mondoarchive and mindi
• Improve kernel 3.14+ detection for initramfs

Location:

branches/3.2

Files:

• mindi/mindi (modified) (2 diffs)
• mondo/src/common/libmondo-archive.c (modified) (1 diff)

branches/3.2/mindi/mindi

@@ -714 +714 @@
     local lcMagicExt2fs="EXT2-fs: blocksize too small for device."
     local lcMagicExt3fs="<3>EXT3-fs: blocksize too small for journal device."
-    local lcMagicInitfs="<6>checking if image is initramfs...|[<]*6[>]*Unpacking initramfs...|<6>Trying to unpack rootfs image as initramfs"
+    local lcMagicInitfs="<6>checking if image is initramfs...|[<]*6[>]*Unpacking initramfs...|[<]*6[>]*Trying to unpack rootfs image as initramfs"
 
     # local variables
@@ -3186 +3186 @@
         DIFFERENTIAL="${19}"
         USE_GZIP="${20}"
-        NOT_BOOT="${21}"
+        USE_LZMA="${21}"
+        NOT_BOOT="${22}"
         [ "$USE_COMP" = "" ] && USE_COMP=yes
         [ "$USE_GZIP" = "" ] && USE_GZIP=no
+        [ "$USE_LZMA" = "" ] && USE_LZMA=no
         [ "$NOT_BOOT" = "" ] && NOT_BOOT=no
         [ "$TAPEDEV" ] && LogIt "INFO: This is a tape-based backup. Fine."

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

@@ -851 +851 @@
             bkpinfo->internal_tape_block_size,  // parameter #18 (LONG)
             bkpinfo->differential,  // parameter #19 (INT)
-            use_gzip_sz,        // parameter #19 (STRING)
-            use_lzma_sz,        // parameter #20 (STRING)
-            value,          // parameter #21 (STRING)
+            use_gzip_sz,        // parameter #20 (STRING)
+            use_lzma_sz,        // parameter #21 (STRING)
+            value,          // parameter #22 (STRING)
             MONDO_LOGFILE       // redirect to log file
             );