| 1 |
martinw |
1583319 |
--- refind-0.12.0/Make.common.orig 2020-05-12 09:26:33.134781002 +0100 |
| 2 |
|
|
+++ refind-0.12.0/Make.common 2020-05-12 09:28:13.623350600 +0100 |
| 3 |
martinw |
1258332 |
@@ -17,10 +17,11 @@ |
| 4 |
|
|
# used to compile rEFInd.... |
| 5 |
|
|
# |
| 6 |
|
|
|
| 7 |
|
|
+LIBDIR ?= /usr/lib |
| 8 |
|
|
EFIINC = /usr/include/efi |
| 9 |
|
|
-GNUEFILIB = /usr/lib |
| 10 |
|
|
-EFILIB = /usr/lib |
| 11 |
|
|
-EFICRT0 = /usr/lib |
| 12 |
|
|
+GNUEFILIB = $(LIBDIR) |
| 13 |
|
|
+EFILIB = $(LIBDIR) |
| 14 |
|
|
+EFICRT0 = $(LIBDIR)/gnuefi |
| 15 |
|
|
|
| 16 |
|
|
# Comment out above and uncomment below if using locally-compiled GNU-EFI.... |
| 17 |
|
|
#EFIINC = /usr/local/include/efi |
| 18 |
martinw |
1583319 |
--- refind-0.12.0/refind-install.orig 2020-05-12 09:15:03.231256311 +0100 |
| 19 |
|
|
+++ refind-0.12.0/refind-install 2020-05-12 09:24:24.226770630 +0100 |
| 20 |
|
|
@@ -1217,19 +1217,23 @@ |
| 21 |
martinw |
1258332 |
done |
| 22 |
|
|
} # FindLinuxESP() |
| 23 |
|
|
|
| 24 |
martinw |
1583319 |
-# Identifies the ESP's location (/boot, /boot/efi, /efi, or these locations |
| 25 |
|
|
+# Identifies the ESP's location (/boot, /boot/efi, /boot/EFI, /efi, or these locations |
| 26 |
|
|
# under the directory specified by --root); aborts if the ESP isn't mounted at |
| 27 |
|
|
# any of these locations. |
| 28 |
martinw |
1258332 |
# Sets InstallDir to the ESP mount point. |
| 29 |
|
|
FindMountedESP() { |
| 30 |
|
|
mount /boot &> /dev/null |
| 31 |
martinw |
1583319 |
mount /boot/efi &> /dev/null |
| 32 |
martinw |
1258332 |
+ mount /boot/EFI &> /dev/null |
| 33 |
martinw |
1342446 |
mount /efi &> /dev/null |
| 34 |
|
|
EspLine=`df "$RootDir/efi" 2> /dev/null | grep efi` |
| 35 |
martinw |
1258332 |
if [[ ! -n "$EspLine" ]] ; then |
| 36 |
martinw |
1583319 |
EspLine=`df "$RootDir"/boot/efi 2> /dev/null | grep boot/efi` |
| 37 |
martinw |
1258332 |
fi |
| 38 |
martinw |
1342446 |
if [[ ! -n "$EspLine" ]] ; then |
| 39 |
martinw |
1583319 |
+ EspLine=`df "$RootDir"/boot/EFI 2> /dev/null | grep boot/EFI` |
| 40 |
|
|
+ fi |
| 41 |
|
|
+ if [[ ! -n "$EspLine" ]] ; then |
| 42 |
martinw |
1342446 |
EspLine=`df "$RootDir"/boot 2> /dev/null | grep boot` |
| 43 |
martinw |
1258332 |
fi |
| 44 |
martinw |
1583319 |
InstallDir=`echo $EspLine | cut -d " " -f 6 | sed 's/\/\+/\//g'` |
| 45 |
|
|
@@ -1242,8 +1246,8 @@ |
| 46 |
|
|
fi |
| 47 |
martinw |
1258332 |
if [[ $EspFilesystem != 'vfat' ]] ; then |
| 48 |
|
|
echo "$RootDir/$InstallDir doesn't seem to be on a VFAT filesystem. The ESP must be" |
| 49 |
martinw |
1583319 |
- echo "mounted at $RootDir/boot, $RootDir/efi, or $RootDir/boot/efi, and it must be" |
| 50 |
|
|
- echo "VFAT (not msdos)! Aborting!" |
| 51 |
|
|
+ echo "mounted at $RootDir/boot, $RootDir/efi, $RootDir/boot/efi, or $RootDir/boot/EFI," |
| 52 |
|
|
+ echo "and it must be VFAT (not msdos)! Aborting!" |
| 53 |
martinw |
1258332 |
if [[ -d /sys/firmware/efi ]] ; then |
| 54 |
|
|
exit 1 |
| 55 |
|
|
else |
Parent Directory
| 
Revision Log