Changeset 1566 in MondoRescue

Timestamp:

Jul 25, 2007, 5:15:33 PM (18 years ago)

Author:

Bruno Cornec

Message:

Add support for gzip compressed kernel in mindi (ia64 SLES 10 is in that category)

File:

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

branches/2.2.5/mindi/mindi

@@ -875 +875 @@
     [ ! -f $lvKernelImage ] && Die "File $lvKernelImage not found. Terminating."
 
-    # get offet of gzip magic "1f8b0800" in file
-    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."
-    lvOffset=`expr $lvOffset / 2`
-    echo "  GetInitrdFilesystemToUse(): gzip magic found at lvOffset $lvOffset.\n" >> $LOGFILE
-
-    # 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" -e "$lcMagicExt2fs" -e "$lcMagicInitfs"`
+    # Kernel may be gzip compressed
+    file $lvKernelImage 2>&1 | grep -q  gzip
+    if [ $? -eq 0 ]; then
+        lvScanRes=`gzip -cd $lvKernelImage | strings | grep -e "$lcMagicCramfs" -e "$lcMagicExt2fs" -e "$lcMagicInitfs"`
+    else
+        # get offet of gzip magic "1f8b0800" in file
+        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."
+        lvOffset=`expr $lvOffset / 2`
+        echo "  GetInitrdFilesystemToUse(): gzip magic found at lvOffset $lvOffset.\n" >> $LOGFILE
+
+        # 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" -e "$lcMagicExt2fs" -e "$lcMagicInitfs"`
+    fi
 
     # determine which filesystem to use for initrd image: ext2fs, gzip'ed cpio (initramfs ) or cramfs