Changeset 1730 in MondoRescue

Timestamp:

Oct 29, 2007, 1:47:34 PM (16 years ago)

Author:

Bruno Cornec

Message:

Attempt to fix a bug in supporting OpenSusE 10.3 kernel for initramfs
(mindi may now use multiple regex for kernel initrd detection)

File:

• branches/2.2.5/mindi/mindi (modified) (3 diffs)

branches/2.2.5/mindi/mindi

@@ -879 +879 @@
     local lcMagicCramfs="<3>cramfs: wrong magic"
     local lcMagicExt2fs="<3>EXT2-fs: blocksize too small for device."
-    local lcMagicInitfs="<6>checking if image is initramfs..."
+    local lcMagicInitfs="<6>checking if image is initramfs...|<6>Unpacking initramfs..."
 
     # local variables
@@ -893 +893 @@
 
     # Kernel may be gzip compressed
-    file $lvKernelImage 2>&1 | grep -q  gzip
+    file $lvKernelImage 2>&1 | grep -q gzip
     if [ $? -eq 0 ]; then
-        lvScanRes=`gzip -cd $lvKernelImage | strings | grep -e "$lcMagicCramfs" -e "$lcMagicExt2fs" -e "$lcMagicInitfs"`
+        lvScanRes=`gzip -cd $lvKernelImage | strings | grep -E "$lcMagicCramfs|$lcMagicExt2fs|$lcMagicInitfs"`
     else
         # get offet of gzip magic "1f8b0800" in file
@@ -904 +904 @@
 
         # 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"`
+        lvScanRes=`dd ibs=1 skip=$lvOffset if=$lvKernelImage obs=1M 2>/dev/null | gunzip -c 2> /dev/null | strings | grep -E "$lcMagicCramfs|$lcMagicExt2fs|$lcMagicInitfs"`
     fi
 
     # determine which filesystem to use for initrd image: ext2fs, gzip'ed cpio (initramfs ) or cramfs
-    if [ `echo $lvScanRes | grep -c "$lcMagicExt2fs"` -eq 1 ]; then
+    if [ `echo $lvScanRes | grep -Ec "$lcMagicExt2fs"` -eq 1 ]; then
         lvUseFilesystem="ext2fs"
-    elif [ `echo $lvScanRes | grep -c "$lcMagicInitfs"` -eq 1 ]; then
+    elif [ `echo $lvScanRes | grep -Ec "$lcMagicInitfs"` -eq 1 ]; then
         lvUseFilesystem="initramfs"
-    elif [ `echo $lvScanRes | grep -c "$lcMagicCramfs"` -eq 1 ]; then
+    elif [ `echo $lvScanRes | grep -Ec "$lcMagicCramfs"` -eq 1 ]; then
         lvUseFilesystem="cramfs"
     else