Changeset 2395 in MondoRescue for branches/2.2.10/mindi/mindi

Timestamp:

Sep 12, 2009, 2:57:02 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Fix interface of evaluate_mountlist (remove 2nd param useless) and fix nuke mode which wasn't working.
• Tries to add support for bzip2 and lzma initramfs (preliminary, not tested) for 2.6.30

(Backport from 2.2.9)

File:

• branches/2.2.10/mindi/mindi (modified) (1 diff)

branches/2.2.10/mindi/mindi

@@ -653 +653 @@
         lvScanRes=`gzip -cd $lvKernelImage | strings | grep -E "$lcMagicCramfs|$lcMagicExt2fs|$lcMagicExt3fs|$lcMagicInitfs"`
     else
-        # get offet of gzip magic "1f8b0800" in file
+        # Since 2.6.30 kernel can use lzma and bzip2 in addition to gzip for initramfs compression
+        # get offet of gzip magic "1f8b0800" in file (or 1f8b9e ??)
         lvOffset=`od -vA n -t x1 $lvKernelImage | tr -d '[:space:]' | awk '{ print match($0, "1f8b0800")}'`
-        [ $lvOffset -eq 0 ] && Die "gzip magic not found in file $lvKernelImage. Terminating."
+        if [ $lvOffset -eq 0 ]; then
+            # get offet of bzip2 magic "425a" in file
+            lvOffset=`od -vA n -t x1 $lvKernelImage | tr -d '[:space:]' | awk '{ print match($0, "425a")}'`
+            if [ $lvOffset -eq 0 ]; then
+                # get offet of lzma magic "5d00" in file
+                lvOffset=`od -vA n -t x1 $lvKernelImage | tr -d '[:space:]' | awk '{ print match($0, "5d00")}'`
+                if [ $lvOffset -eq 0 ]; then
+                    Die "No magic compression pattern found in file $lvKernelImage. Terminating."
+                else
+                    comp="lzma"
+                fi
+            else
+                comp="bzip2"
+            fi
+        else
+            comp="gzip"
+        fi
+
         lvOffset=`expr $lvOffset / 2`
-        LogFile "  GetInitrdFilesystemToUse(): gzip magic found at lvOffset $lvOffset.\n" 
+        LogFile "  GetInitrdFilesystemToUse(): $comp magic found in $lvKernelImage at lvOffset $lvOffset.\n"
 
         # scan kernel image for initrd filessystem support
-        lvScanRes=`dd ibs=1 skip=$lvOffset if=$lvKernelImage obs=1M 2>/dev/null | gunzip -c 2> /dev/null | strings | grep -E "$lcMagicCramfs|$lcMagicExt2fs|$lcMagicExt3fs|$lcMagicInitfs"`
+        lvScanRes=`dd ibs=1 skip=$lvOffset if=$lvKernelImage obs=1M 2>/dev/null | $comp -dc 2> /dev/null | strings | grep -E "$lcMagicCramfs|$lcMagicExt2fs|$lcMagicExt3fs|$lcMagicInitfs"`
     fi