Changeset 3111 in MondoRescue for branches/3.0/mindi/mindi

Timestamp:

May 5, 2013, 4:55:42 AM (11 years ago)

Author:

Bruno Cornec

Message:

• revert patch 3106-2107 from SVK which had removed good code and fixes !!

File:

• branches/3.0/mindi/mindi (modified) (5 diffs)

branches/3.0/mindi/mindi

@@ -756 +756 @@
 
     # say where we are.
-    LogFile "INFO:   GetInitrdFilesystemToUse(): called with parameter: $lvKernelImage"
+    LogFile "INFO: GetInitrdFilesystemToUse(): called with parameter: $lvKernelImage"
 
     # verify that file exists
     [ ! -f $lvKernelImage ] && Die "File $lvKernelImage not found. Terminating."
 
-    # Kernel may be gzip compressed
+    # Kernel may be gzip compressed - Case of RHEL5 - SLES11SP1
     file $lvKernelImage 2>&1 | grep -q gzip
     if [ $? -eq 0 ]; then
-        lvScanRes=`gzip -cd $lvKernelImage | strings | grep -E "$lcMagicCramfs|$lcMagicExt2fs|$lcMagicExt3fs|$lcMagicInitfs"`
-
-        # 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"
+        LogFile "INFO: Found a gzip compressed kernel $lvKernelImage"
+        lvScanRes=`gzip -cd $lvKernelImage | strings | grep -E "$lcMagicCramfs|$lcMagicExt2fs|$lcMagicExt3fs|$lcMagicInitfs" 2> /dev/null`
+    else
+        LogFile "INFO: Found a non gzip compressed kernel $lvKernelImage"
+        # kernel is x86 boot sector in RHEL3/4 with embedded gzip content
+        # get offet of gzip magic "1f8b0800" in file (for these older kernels)
+        lvOffset=`od -vA n -t x1 $lvKernelImage | tr -d '[:space:]' | awk '{ print match($0, "1f8b0800")}' 2> /dev/null`
+        if [ $lvOffset -eq 0 ]; then
+            LogFile "INFO: gzip magic not found in file $lvKernelImage. Supposing initramfs."
+            lvScanRes=$lcMagicInitfs
         else
-            lvUseFilesystem="UNSUPPORTED"
-        fi
-
-    else
-        # In that case, we are after 2.6.30 and use the supported initramfs 
+            lvOffset=`expr $lvOffset / 2`
+            LogFile "INFO: GetInitrdFilesystemToUse(): gzip magic found at lvOffset $lvOffset."
+            # scan again  kernel image
+            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" 2> /dev/null`
+        fi
+    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"
-    fi
+    elif [ `echo $lvScanRes | grep -Ec "$lcMagicCramfs"` -eq 1 ]; then
+        lvUseFilesystem="cramfs"
+    else
+        # In that case, we are most probably after 2.6.30 and use the supported initramfs 
+        LogFile "No automatic detection found previously. Supposing initramfs."
+        LogFile "Report on the MondoRescue mailing-list withyour log files"
+        lvUseFilesystem="initramfs"
+    fi
+
     # say what we are using
-    LogFile "INFO:   GetInitrdFilesystemToUse(): Filesytem to use for initial ram disk is $lvUseFilesystem."
+    LogFile "INFO: GetInitrdFilesystemToUse(): Filesytem to use for initial ram disk is $lvUseFilesystem."
 
     # return file system to use
@@ -922 +937 @@
     file="$1"
 
-    echo $file | grep -q '\.\./'
-    if [ $? -eq 0 ]; then
+    while [ `echo $file | grep -Ec '\.\./'` -ne 0 ]; do
         # We need to normalise the path with .. in it
-        file=`echo $file | perl -pi -e 's|([^/]+)/([^/]+)/\.\./([^/]+)|$1/$3|'`
-    fi
+        file=`echo $file | perl -pi -e 's|([^/]*)/([^/]+)/\.\./([^/]+)|$1/$3|g'`
+    done
     echo "$file"
     if [ ! -h $file ]; then
@@ -1804 +1818 @@
     for i in $options ; do
         ooo=$i
-        [ "$ooo" = "RESTORE" ] && ooo="nuke"
+        [ "$ooo" = "RESTORE" ] && ooo="RESTORE nuke"
         if [ "$type" = "elilo" ]; then
             outstr="image=/vmlinuz\n\tlabel=$i\n\tinitrd=/initrd.img\n\troot=/dev/ram0 append=\" rw ramdisk_size=$ramdisk_size $ooo $MINDI_ADDITIONAL_BOOT_PARAMS \"\n"
@@ -2588 +2602 @@
         fi
     done
-    tar cf - $finallist 2>> $MINDI_TMP/$$.log | tar xUf - || LogIt "ERROR: Problem in minimal analysis" $MINDI_TMP/$$.log
+    tar cf - $finallist 2>> $MINDI_TMP/$$.log | tar xUf - || LogIt "WARNING: Problem in minimal analysis" $MINDI_TMP/$$.log
 
     # To improve support for distribution scripts, we now prefer to use bash as the std shell. Also fixes #600
@@ -3231 +3245 @@
 
 for i in loop cdrom ide-cd isofs linear raid0 raid1 raid5 ; do
-    modinfo 2> /dev/null 1> /dev/null
+    modinfo $i 2> /dev/null 1> /dev/null
     if [ $? -eq 0 ]; then
         modprobe $i 2>&1 > /dev/null