Changeset 1570 in MondoRescue for branches/stable/mindi/mindi

Timestamp:

Jul 26, 2007, 1:35:59 AM (17 years ago)

Author:

Bruno Cornec

Message:

• Add support of Debian ia64 in mondo
• Fix mindi iso build for ia64 (test was reversed)
• Add support for gzip compressed kernel in mindi (ia64 SLES 10 is in that category)
• arch => uname -m everywhere
• parted2fdisk adapted for parted differences on SLES 10 ia64
• reiserfs support added for parted2fdisk
• decode_Bsuf function added for parted2fdisk
• README.ia64 improved for SLES 10

(merge -r 1563:1567 $SVN_M/branches/2.2.5)

Also begin to remove floppy support from mindi

File:

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

branches/stable/mindi/mindi

@@ -14 +14 @@
 
 ### Which arch are we on (useful for ia64 port)
-ARCH=`/bin/arch`
+ARCH=`/bin/uname -m`
 
 #RUN_AFTER_INITIAL_BOOT_PHASE="echo \"Who lives in a pineapple under the sea?\" > /tmp/spongebob.squarepants.txt"
@@ -880 +880 @@
     [ ! -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
@@ -3341 +3347 @@
 
 echo "Ramdisk will be $ramdisk_size KB" >> $LOGFILE
-if [ "$USE_LILO" = "yes" ] ; then
-    if [ "$ARCH" = "ia64" ] ; then
-        PrepareBootDiskImage_LILO $MINDI_CACHE $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create ia64 floppy disk image."
-    else
-        if ! PrepareBootDiskImage_LILO $MINDI_CACHE 2880 $kernelpath $ramdisk_size ;  then
-            LogIt "WARNING - failed to create 2.88MB floppy disk image."
-            LogIt "Please reduce your kernel's size if you want to make a 2.88MB floppy disk."
-            PrepareBootDiskImage_LILO $MINDI_CACHE $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create 2.88MB floppy disk image."
-        fi
-    fi
+if [ "$ARCH" = "ia64" ] ; then
+    PrepareBootDiskImage_LILO $MINDI_CACHE $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create ia64 floppy disk image."
 else
-    if ! PrepareBootDiskImage_SYSLINUX $MINDI_CACHE 2880 $kernelpath $ramdisk_size ; then
-        LogIt "WARNING - failed to create 2.88MB floppy disk image."
-        LogIt "Please reduce your kernel's size if you want to make a 2.88MB floppy disk."
-        PrepareBootDiskImage_SYSLINUX $MINDI_CACHE $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create 5.76MB floppy disk image."
+    if [ "$USE_LILO" = "yes" ] ; then
+        PrepareBootDiskImage_LILO $MINDI_CACHE $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create $BOOT_SIZE MB disk image."
+        fi
+    else
+        PrepareBootDiskImage_SYSLINUX $MINDI_CACHE $BOOT_SIZE $kernelpath $ramdisk_size || Die "Failed to create $BOOT_SIZE MB disk image."
     fi
 fi