Changeset 2629 in MondoRescue

Timestamp:

May 11, 2010, 4:41:06 AM (14 years ago)

Author:

Bruno Cornec

Message:

Integrate Michael Shapiro's patch on Xen Kernel support for RHEL 5 (only atm) and fixes #418 (Michael Shapiro)

File:

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

branches/2.2.9/mindi/mindi

@@ -50 +50 @@
     # If "yes" mindi will automatically use your own kernel.
 
+KERNEL_IS_XEN="no"
+    # If set to "no", the kernel is not a Xen kernel
+    # If "yes", mindi will modify isolinux.cfg for the Xen kernel.
+ 
 MY_FSTAB=/etc/fstab
 TAPE_MODS="ht st osst ide-tape ide_tape"
@@ -419 +423 @@
 }
 
+
+FindMboot32Binary() {
+    MBOOTC32=/usr/lib/syslinux/mboot.c32
+    [ ! -e "$MBOOTC32" ] && MBOOTC32=/usr/lib/syslinux/mboot.c32
+    [ ! -e "$MBOOTC32" ] && MBOOTC32=/usr/lib64/syslinux/mboot.c32
+    [ ! -e "$MBOOTC32" ] && MBOOTC32=/usr/share/syslinux/mboot.c32
+    [ ! -e "$MBOOTC32" ] && MBOOTC32=/usr/share/lib/syslinux/mboot.c32
+    [ ! -e "$MBOOTC32" ] && MBOOTC32=/usr/share/lib64/syslinux/mboot.c32
+    [ ! -e "$MBOOTC32" ] && MBOOTC32=`find / -name mboot.c32 | grep -x "/.*/mboot.c32"`
+    [ ! -e "$MBOOTC32" ] && Die "Please install mboot.c32 first. If your syslinux RPM doesn't include mboot.c32, you may download an isolinux RPM from Mondo's website - go to http://www.mondorescue.com and click on 'Download'"
+    echo "Found mboot.c32 at $MBOOTC32" >> $LOGFILE
+    LogIt "  Found mboot.c32 at $MBOOTC32"
+}
 
 FindIsolinuxBinary() {
@@ -1408 +1425 @@
     MakeMessageFile > $MINDI_TMP/iso/message.txt
     cp $kernelpath $MINDI_TMP/iso/vmlinuz 2>> $LOGFILE || Die "Cannot copy vmlinuz ($kernelpath) to mindi tmp ($MINDI_TMP/iso/vmlinuz). Did you run out of disk space?"
+    if [ $KERNEL_IS_XEN = "yes" ]; then
+        cp $xenkernelpath $MINDI_TMP/iso/xen.gz 2>> $LOGFILE || Die "Cannot copy xen.gz ($xenkernelpath) to mindi tmp ($MINDI_TMP/iso/xen.gz). Did you run out of disk space?"
+        cp $MBOOTC32 $MINDI_TMP/iso/mboot.c32  2>> $LOGFILE || Die "Cannot copy mboot.c32 ($MBOOTC32) to mindi tmp ($MINDI_TMP/iso/mboot.c32). Did you run out of disk space?"
+    fi
+
     cp $MINDI_TMP/initrd.img $MINDI_TMP/iso/initrd.img 2>> $LOGFILE || Die "Cannot copy initrd.img ($MINDI_TMP/initrd.img) to $MINDI_TMP/iso/initrd.img. Did you run out of disk space?"
     if [ _"$MONDO_SHARE" != _"" ]; then 
@@ -1421 +1443 @@
     if [ "$ARCH" != "ia64" ] ; then
         if [ _"$MONDO_SHARE" != _"" ]; then 
-            cp -f $MINDI_TMP/iso/{isolinux.cfg,initrd.img,vmlinuz,isolinux.bin,message.txt} $MONDO_ROOT 2>> $LOGFILE || Die "Cannot copy core files to ramdisk for boot disk (under $MONDO_ROOT). Did you run out of disk space?"
+            if [ $KERNEL_IS_XEN = "no" ]; then
+                cp -f $MINDI_TMP/iso/{isolinux.cfg,initrd.img,vmlinuz,isolinux.bin,message.txt} $MONDO_ROOT 2>> $LOGFILE || Die "Cannot copy core files to ramdisk for boot disk (under $MONDO_ROOT). Did you run out of disk space?"
+            else
+                cp -f $MINDI_TMP/iso/{isolinux.cfg,initrd.img,vmlinuz,isolinux.bin,message.txt,mboot.c32,xen.gz} $MONDO_ROOT 2>> $LOGFILE || Die "Cannot copy core files to ramdisk for boot disk (under $MONDO_ROOT). Did you run out of disk space?"
+            fi
             cp -f $MONDO_SHARE/autorun $MINDI_TMP/iso 2>> $LOGFILE
         fi
@@ -1668 +1694 @@
                 ps=""
             fi
-            outstr="label $i\n\tkernel ${ps}vmlinuz\n\tappend initrd=${ps}initrd.img root=/dev/ram0 rw ramdisk_size=$ramdisk_size ${ooo} $MINDI_ADDITIONAL_BOOT_PARAMS\n"
+            if [ $KERNEL_IS_XEN = "no" ]; then
+                outstr="label $i\n\tkernel ${ps}vmlinuz\n\tappend initrd=${ps}initrd.img root=/dev/ram0 rw ramdisk_size=$ramdisk_size ${ooo} $MINDI_ADDITIONAL_BOOT_PARAMS\n"
+            else
+                outstr="label $i\n\tkernel ${ps}mboot.c32\n\tappend ${ps}xen.gz --- ${ps}vmlinuz root=/dev/ram0 rw ramdisk_size=$ramdisk_size  ${ooo} $MINDI_ADDITIONAL_BOOT_PARAMS --- ${ps}initrd.img\n"
+            fi
         fi
         echo -en "$outstr"
     done
-
     if [ -e "$MINDI_LIB/memtest.img" ] ; then
         if [ "$type" = "elilo" ]; then
@@ -1844 +1873 @@
     dd if=/dev/zero of=$mountpoint/zero bs=1k count=16 &> /dev/null
     free_space=`df -k -P $mountpoint | tail -n1 | tr -s ' ' '\t' | cut -f4`
-    cp -f $kernelpath $mountpoint/vmlinuz &> /dev/null
-    if [ "$?" -ne "0" ] ; then
+         
+    retval=0
+    if [ $KERNEL_IS_XEN = "no" ]; then
+        cp -f $kernelpath $mountpoint/vmlinuz &> /dev/null
+        retval=$?
+    else
+        cp -f $xenkernelpath $mountpoint/xenkernel &> /dev/null
+        retval=$?
+        cp -f $kernelpath $mountpoint/vmlinuz &> /dev/null
+        let retval+=$?
+    fi
+ 
+    if [ "$retval" -ne "0" ] ; then
         echo "Files at mountpoint ($mountpoint) :-" >> $LOGFILE
         du -sk $mountpoint/* >> $LOGFILE
@@ -2812 +2852 @@
 
         kernelpath=$4; [ "$kernelpath" = "(null)" ] && kernelpath=""
+        # See if it's a Xen kernel
+        if [ -n "$kernelpath" ]; then
+            strings $kernelpath | grep -iq xen 2>/dev/null
+            if [ $? -eq 0 ]; then
+                # It's a Xen kernel
+                KERNEL_IS_XEN=yes
+                LogIt "It's a Xen kernel..."
+                # WARNING: This will only work for RHEL 5
+                # TODO: SLES and others
+                # Use TryToFindKernelPath ?
+                xenkernelpath="/boot/`uname -r | awk '{sub("[Xx][Ee][Nn]",""); printf("xen.gz-%s",$0)}'`"
+                if [[ -z "$xenkernelpath" || ! -f "$xenkernelpath" ]]; then
+                    Die "Cannot find Xen kernel $xenkernelpath, aborting"
+                fi
+                xenkernelname=`basename $xenkernelpath`
+                FindMboot32Binary 
+            fi
+        fi
+
 ###
 ### Sq-Modification...
@@ -2817 +2876 @@
 ### if module path is found then use it other wise use uname -r to set it...
 ###
+        if [ $KERNEL_IS_XEN = "yes" ]; then
+            LogIt "xenkernelpath = $xenkernelpath"
+            LogIt "xenkernelname = $xenkernelname"
+        fi
         kernelname=`echo $kernelpath | cut -d'-' -f2-`
         LogIt "kernelname = $kernelname"