Changeset 3421 in MondoRescue for branches

Timestamp:

Aug 26, 2015, 12:15:40 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Add fixes for UEFI support (creates a EFI dir or boot dir in the ISO to allow for boot in UEFI with presence of grub legacy info, mindi now detects alone UEFI mode or BIOS mode, mindi now prints the mkisofs cmdline, and only warn on mondorescue.cfg if called from mondo)

File:

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

branches/3.2/mindi/mindi

@@ -113 +113 @@
 ISO_OPT="-J -r -v -p Mindi -publisher http://www.mondorescue.org -A Mindi"
 
-# Mindi should master this in fact
-#BOOT_TYPE="BIOS"
+# Mindi set this as default in case it's invoked alone
+BOOT_TYPE="BIOS"
+# and we also check whether we're UEFI or not.
+if [ -d "/sys/firmware/efi" ]; then
+    BOOT_TYPE="UEFI"
+fi
 
 # Mandriva system e.g. use cdrkit, which uses genisoimage instead of mkisofs.
@@ -1489 +1493 @@
         cp $ISOLINUX $MINDI_TMP/iso/isolinux.bin 2>> $LOGFILE || Die "Cannot copy isolinux.bin ($ISOLINUX) to $MINDI_TMP/iso - did you run out of disk space?"
     fi
+
+    # copy boot stuff now generated in PrepareDataDiskImage
+    if [ $BIOS_TYPE = "UEFI" ]; then
+        (cd $MINDI_TMP/iso ; tar xfz $MINDI_CACHE/all.tar.gz ./EFI)
+        tbc="EFI"
+    else
+        (cd $MINDI_TMP/iso ; tar xfz $MINDI_CACHE/all.tar.gz ./boot)
+        tbc="boot"
+    fi
+
     old_pwd=`pwd`
     cd "$MINDI_TMP/iso"
     if [ "$ARCH" != "ia64" ] ; then
         if [ _"$MONDO_SHARE" != _"" ]; then 
-            cp -f $MINDI_TMP/iso/{isolinux.cfg,initrd.img,vmlinuz,isolinux.bin,message.txt,boot*.txt,pxe.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?"
+            cp -rf $MINDI_TMP/iso/{isolinux.cfg,initrd.img,vmlinuz,isolinux.bin,message.txt,boot.*,pxe.txt,$tbc} $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 [ -e $MINDI_TMP/iso/ldlinux.c32 ]; then
                 cp $MINDI_TMP/iso/ldlinux.c32 $MONDO_ROOT 2>> $LOGFILE || Die "Cannot copy ldlinux.c32 (from $MINDI_TMP/iso/$LDLINUXC32) to $MONDO_ROOT. Did you run out of disk space?"
@@ -1502 +1516 @@
             cp -f $MONDO_SHARE/autorun $MINDI_TMP/iso 2>> $LOGFILE
         fi
-        $ISO_CMD -U $ISO_OPT -V Mindi_Image -o $MINDI_CACHE/mindi.iso -b isolinux.bin -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table . > /dev/null 2> $MINDI_TMP/mkisofs.log
+        CMD="$ISO_CMD -U $ISO_OPT -V Mindi_Image -o $MINDI_CACHE/mindi.iso -b isolinux.bin -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table ."
     else
-        $ISO_CMD $ISO_OPT -V Mindi_Image -o $MINDI_CACHE/mindi.iso -b images/mindi-bootroot.img -c images/boot.cat -no-emul-boot . > /dev/null 2> $MINDI_TMP/mkisofs.log
-    fi
+        CMD="$ISO_CMD $ISO_OPT -V Mindi_Image -o $MINDI_CACHE/mindi.iso -b images/mindi-bootroot.img -c images/boot.cat -no-emul-boot ."
+    fi
+    LogFile "Invoking $CMD"
+    $CMD > /dev/null 2> $MINDI_TMP/mkisofs.log
     if [ "$?" -ne "0" ] ; then
         LogFile "----------- $ISO_CMD's errors --------------"
@@ -1876 +1892 @@
     mount -t vfat -o loop $imagefile $mountpoint || LogAll "ERROR: Cannot mount (PBDI)"
 
-    # copy boot stuff into it now generated in PrepareDataDisk
-    (cd $mountpoint ; tar xfz $MINDI_CACHE/all.tar.gz boot)
-
     LogFile "INFO: Copying $MINDI_TMP/initrd.img to $mountpoint/initrd.img..."
     cp -f $MINDI_TMP/initrd.img $mountpoint/initrd.img 2>> $LOGFILE
@@ -2093 +2106 @@
         if [ "$BOOT_TYPE" = "UEFI" ]; then
             # UEFI
-            lilodir=$bootdir/EFI
+            lilodir=$bigdir/EFI/BOOT
             mkdir -p $lilodir
             liloconf="$lilodir/grub.conf"
-            lilobin="grub.efi"
+            # grub.efi for rhel6 and grubx64.efi for rhel7
+            lilobin="grub*.efi"
             
             MakeBootConfFile grub > $liloconf
@@ -2120 +2134 @@
             mountefi=1
         fi
-        el=`find /boot/efi -iname $lilobin`
+        el=`find /boot/efi -iname "$lilobin"`
         cp $el $lilodir
         if [ $mountefi -eq 1 ]; then
@@ -2129 +2143 @@
     fi
 
-    if [ "$BOOT_TYPE" = "UEFI"] && [ -f "$lilodir/grub.conf" ]; then
+    #if [ "$BOOT_TYPE" = "UEFI" ] && [ -f "$lilodir/grub.conf" ]; then
         # for grub 0.97 the conf file is not read with the grub.efi file :-( 
         # Not very nice, but needed it seems
-        LogFile "Copying grub.conf file as we use legacy grub on UEFI"
-        mkdir -p $bootdir/boot/grub
-        cp $lilodir/grub.conf $bootdir/boot/grub
-    fi
+        #LogFile "Copying grub.conf file as we use legacy grub on UEFI"
+        #mkdir -p $bootdir/boot/grub
+        #cp $lilodir/grub.conf $bootdir/boot/grub
+    #fi
 
     echo -en "Tarring and zipping the data content..."
@@ -3354 +3368 @@
     LogIt "--------------------------"
 else
-    LogIt "ERROR: You don't have a $MRCFG file !"
+    if [ _"$MONDO_SHARE" != _"" ] ; then
+        LogIt "ERROR: You don't have a $MRCFG file !"
+    fi
 fi
 # cleanup