Changeset 2429 in MondoRescue

Timestamp:

Sep 28, 2009, 11:46:16 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Simplify GetInitrdFilesystemToUse which doesn't need to detect everything, but just know if it's initramfs (new mode) or a compressed FS ext2/3 (older mode) as initrd is anyway re-made by mindi. Should fix #353

File:

• branches/2.2.9/mindi/mindi (modified) (2 diffs)

branches/2.2.9/mindi/mindi

@@ -646 +646 @@
 
 # Check kernel filesystem capabilites for accessing initrd image
+# Could be ext2 FS (old mode) or initramfs (new mode)
 #
 # Interface definition:
@@ -681 +682 @@
     if [ $? -eq 0 ]; then
         lvScanRes=`gzip -cd $lvKernelImage | strings | grep -E "$lcMagicCramfs|$lcMagicExt2fs|$lcMagicExt3fs|$lcMagicInitfs"`
-    else
-        # 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")}'`
-        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
+
+        # determine which filesystem to use for initrd image: ext2|3fs, gzip'ed cpio (initramfs) or cramfs
+        if [ `echo $lvScanRes | grep -Ec "$lcMagicExt2fs"` -eq 1 ]; then
+            lvUseFilesystem="ext2fs"
+        elif [ `echo $lvScanRes | grep -Ec "$lcMagicExt3fs"` -eq 1 ]; then
+            lvUseFilesystem="ext3fs"
+        elif [ `echo $lvScanRes | grep -Ec "$lcMagicInitfs"` -eq 1 ]; then
+            lvUseFilesystem="initramfs"
+        elif [ `echo $lvScanRes | grep -Ec "$lcMagicCramfs"` -eq 1 ]; then
+            lvUseFilesystem="cramfs"
         else
-            comp="gzip"
-        fi
-
-        lvOffset=`expr $lvOffset / 2`
-        echo "  GetInitrdFilesystemToUse(): $comp magic found in $lvKernelImage 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 | $comp -dc 2> /dev/null | strings | grep -E "$lcMagicCramfs|$lcMagicExt2fs|$lcMagicExt3fs|$lcMagicInitfs"`
-    fi
-
-    # determine which filesystem to use for initrd image: ext2fs, gzip'ed cpio (initramfs ) or cramfs
-    if [ `echo $lvScanRes | grep -Ec "$lcMagicExt2fs"` -eq 1 ]; then
-        lvUseFilesystem="ext2fs"
-    elif [ `echo $lvScanRes | grep -Ec "$lcMagicExt3fs"` -eq 1 ]; then
-        lvUseFilesystem="ext3fs"
-    elif [ `echo $lvScanRes | grep -Ec "$lcMagicInitfs"` -eq 1 ]; then
+            lvUseFilesystem="UNSUPPORTED"
+        fi
+
+    else
+        # In that case, we are after 2.6.30 and use the supported initramfs 
         lvUseFilesystem="initramfs"
-    elif [ `echo $lvScanRes | grep -Ec "$lcMagicCramfs"` -eq 1 ]; then
-        lvUseFilesystem="cramfs"
-    else
-        lvUseFilesystem="UNSUPPORTED"
-    fi
-
+    fi
     # say what we are using
-    echo "  GetInitrdFilesystemToUse(): Filesytem to use for initrd is $lvUseFilesystem.\n" >> $LOGFILE
+    echo "  GetInitrdFilesystemToUse(): Filesytem to use for initial ram disk is $lvUseFilesystem.\n" >> $LOGFILE
 
     # return file system to use