Changeset 3725


Ignore:
Timestamp:
Nov 10, 2019, 6:20:17 PM (9 months ago)
Author:
Bruno Cornec
Message:

Attempt to fix Debian UEFI support

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.3/mindi/mindi

    r3722 r3725  
    521521    if [ ! -e "$LDLINUXC32" ]; then
    522522        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"
    523         LDLINUXC32=/tmp/idoesnthopefullyexist
     523        LDLINUXC32=/tmp/itdoesntexist
    524524    else
    525525        LogFile "INFO: Found ldlinux.c32 at $LDLINUXC32"
     
    21202120    FindLdlinux32Binary
    21212121
     2122    dname=`pbdistrocheck | grep -E '^Name:' | cut -d':' -f2`
     2123    dver=`pbdistrocheck | grep -E '^Ver:' | cut -d':' -f2`
     2124
    21222125    if [ "$BOOT_TYPE" != "BIOS" ]; then
    21232126        if [ "$BOOT_TYPE" = "UNKNOWN" ]; then
     
    21472150
    21482151                # On RHEL6 grub works
    2149                 dname=`pbdistrocheck | grep -E '^Name:' | cut -d':' -f2`
    2150                 dver=`pbdistrocheck | grep -E '^Ver:' | cut -d':' -f2`
    21512152                if [ $dname = "rhel" -o $dname = "centos" -o $dname = "oel" ] && [ $dver = "6" ]; then
    21522153                    boottype=grub
     
    22312232        cp $LDLINUXC32 "$tgdir" 2>> $LOGFILE || Die "Cannot copy $LDLINUXC32 to $tgdir. Did you run out of disk space?"
    22322233    fi
    2233     if [ -e $LDLINUXC32/../isolinux.c32 ]; then
     2234    if [ -e `dirname $LDLINUXC32`/isolinux.c32 ]; then
    22342235        LogFile "INFO: Copying isolinux.c32 to $tgdir"
    2235         cp $LDLINUXC32/../isolinux.c32 $tgdir 2>> $LOGFILE || Die "Cannot copy isolinux.c32 to $tgdir). Did you run out of disk space?"
     2236        cp `dirname $LDLINUXC32`/isolinux.c32 $tgdir 2>> $LOGFILE || Die "Cannot copy isolinux.c32 to $tgdir). Did you run out of disk space?"
    22362237    fi
    22372238
     
    22482249        cat $bigdir/EFI/syslinux.cfg >> $LOGFILE
    22492250        LogFile "---------------------------------------------------"
     2251        if [ $dname = "debian" ] && [ $dver -ge 8 ]; then
     2252            # In that case it seems we need conf file at the root of the media
     2253            cp -a $bigdir/EFI/* $bigdir
     2254        fi
    22502255    fi
    22512256
Note: See TracChangeset for help on using the changeset viewer.