Changeset 3353


Ignore:
Timestamp:
Mar 3, 2015, 1:32:45 PM (4 years ago)
Author:
bruno
Message:
  • Fix #748 by solving interface issues between mondoarchive and mindi
  • Improve kernel 3.14+ detection for initramfs
Location:
branches/3.2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mindi/mindi

    r3347 r3353  
    714714    local lcMagicExt2fs="EXT2-fs: blocksize too small for device."
    715715    local lcMagicExt3fs="<3>EXT3-fs: blocksize too small for journal device."
    716     local lcMagicInitfs="<6>checking if image is initramfs...|[<]*6[>]*Unpacking initramfs...|<6>Trying to unpack rootfs image as initramfs"
     716    local lcMagicInitfs="<6>checking if image is initramfs...|[<]*6[>]*Unpacking initramfs...|[<]*6[>]*Trying to unpack rootfs image as initramfs"
    717717
    718718    # local variables
     
    31863186        DIFFERENTIAL="${19}"
    31873187        USE_GZIP="${20}"
    3188         NOT_BOOT="${21}"
     3188        USE_LZMA="${21}"
     3189        NOT_BOOT="${22}"
    31893190        [ "$USE_COMP" = "" ] && USE_COMP=yes
    31903191        [ "$USE_GZIP" = "" ] && USE_GZIP=no
     3192        [ "$USE_LZMA" = "" ] && USE_LZMA=no
    31913193        [ "$NOT_BOOT" = "" ] && NOT_BOOT=no
    31923194        [ "$TAPEDEV" ] && LogIt "INFO: This is a tape-based backup. Fine."
  • branches/3.2/mondo/src/common/libmondo-archive.c

    r3351 r3353  
    851851            bkpinfo->internal_tape_block_size,  // parameter #18 (LONG)
    852852            bkpinfo->differential,  // parameter #19 (INT)
    853             use_gzip_sz,        // parameter #19 (STRING)
    854             use_lzma_sz,        // parameter #20 (STRING)
    855             value,          // parameter #21 (STRING)
     853            use_gzip_sz,        // parameter #20 (STRING)
     854            use_lzma_sz,        // parameter #21 (STRING)
     855            value,          // parameter #22 (STRING)
    856856            MONDO_LOGFILE       // redirect to log file
    857857            );
Note: See TracChangeset for help on using the changeset viewer.