Changeset 3725 in MondoRescue

Timestamp:

Nov 10, 2019, 6:20:17 PM (5 years ago)

Author:

Bruno Cornec

Message:

Attempt to fix Debian UEFI support

File:

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

branches/3.3/mindi/mindi

@@ -521 +521 @@
     if [ ! -e "$LDLINUXC32" ]; then 
         LogFile "INFO: If you use syslinux 5.x, you may miss ldlinux.c32. If your syslinux RPM doesn't include ldlinux.c32, you may want to download another one"
-        LDLINUXC32=/tmp/idoesnthopefullyexist
+        LDLINUXC32=/tmp/itdoesntexist
     else
         LogFile "INFO: Found ldlinux.c32 at $LDLINUXC32"
@@ -2120 +2120 @@
     FindLdlinux32Binary
 
+    dname=`pbdistrocheck | grep -E '^Name:' | cut -d':' -f2`
+    dver=`pbdistrocheck | grep -E '^Ver:' | cut -d':' -f2`
+
     if [ "$BOOT_TYPE" != "BIOS" ]; then
         if [ "$BOOT_TYPE" = "UNKNOWN" ]; then
@@ -2147 +2150 @@
 
                 # On RHEL6 grub works
-                dname=`pbdistrocheck | grep -E '^Name:' | cut -d':' -f2`
-                dver=`pbdistrocheck | grep -E '^Ver:' | cut -d':' -f2`
                 if [ $dname = "rhel" -o $dname = "centos" -o $dname = "oel" ] && [ $dver = "6" ]; then
                     boottype=grub
@@ -2231 +2232 @@
         cp $LDLINUXC32 "$tgdir" 2>> $LOGFILE || Die "Cannot copy $LDLINUXC32 to $tgdir. Did you run out of disk space?"
     fi
-    if [ -e $LDLINUXC32/../isolinux.c32 ]; then
+    if [ -e `dirname $LDLINUXC32`/isolinux.c32 ]; then
         LogFile "INFO: Copying isolinux.c32 to $tgdir"
-        cp $LDLINUXC32/../isolinux.c32 $tgdir 2>> $LOGFILE || Die "Cannot copy isolinux.c32 to $tgdir). Did you run out of disk space?"
+        cp `dirname $LDLINUXC32`/isolinux.c32 $tgdir 2>> $LOGFILE || Die "Cannot copy isolinux.c32 to $tgdir). Did you run out of disk space?"
     fi
 
@@ -2248 +2249 @@
         cat $bigdir/EFI/syslinux.cfg >> $LOGFILE
         LogFile "---------------------------------------------------"
+        if [ $dname = "debian" ] && [ $dver -ge 8 ]; then
+            # In that case it seems we need conf file at the root of the media
+            cp -a $bigdir/EFI/* $bigdir
+        fi
     fi