| 1 |
martinw |
1258332 |
--- a/Make.common 2018-05-27 22:56:49.564527567 +0100 |
| 2 |
|
|
+++ b/Make.common 2018-05-27 23:10:22.681242272 +0100 |
| 3 |
|
|
@@ -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 |
|
|
--- a/refind-install 2018-05-27 23:57:45.891669565 +0100 |
| 19 |
|
|
+++ b/refind-install 2018-05-28 00:18:17.307657993 +0100 |
| 20 |
|
|
@@ -1134,8 +1134,8 @@ |
| 21 |
|
|
} # ReSignBinaries() |
| 22 |
|
|
|
| 23 |
|
|
# Locate and mount an ESP, if possible, based on parted output. |
| 24 |
|
|
-# Should be called only if /boot/efi is NOT an acceptable ESP. |
| 25 |
|
|
-# Sets InstallDir to the mounted ESP's path ($RootDir/boot/efi) |
| 26 |
|
|
+# Should be called only if /boot/EFI is NOT an acceptable ESP. |
| 27 |
|
|
+# Sets InstallDir to the mounted ESP's path ($RootDir/boot/EFI) |
| 28 |
|
|
# and EspFilesystem the filesystem (always "vfat") |
| 29 |
|
|
FindLinuxESP() { |
| 30 |
|
|
echo "The ESP doesn't seem to be mounted! Trying to find it...." |
| 31 |
|
|
@@ -1161,10 +1161,10 @@ |
| 32 |
|
|
if [[ $TableType == 'gpt' && $SkipIt == 0 ]] ; then # read only GPT disks that aren't part of dmraid array |
| 33 |
|
|
PartNum=`LANG=C parted $Drive print -m -s 2>/dev/null | awk -F: '$7 ~ "(^boot| boot)" { print $1 }' | head -n 1` |
| 34 |
|
|
if [ "$PartNum" -eq "$PartNum" ] 2> /dev/null ; then |
| 35 |
|
|
- InstallDir="$RootDir/boot/efi" |
| 36 |
|
|
+ InstallDir="$RootDir/boot/EFI" |
| 37 |
|
|
mkdir -p $InstallDir |
| 38 |
|
|
mount $Drive$PartNum $InstallDir |
| 39 |
|
|
- EspFilesystem=`grep "$Drive$PartNum.*/boot/efi" /etc/mtab | uniq | grep -v autofs | cut -d " " -f 3` |
| 40 |
|
|
+ EspFilesystem=`grep "$Drive$PartNum.*/boot/EFI" /etc/mtab | uniq | grep -v autofs | cut -d " " -f 3` |
| 41 |
|
|
if [[ $EspFilesystem != 'vfat' ]] ; then |
| 42 |
|
|
umount $InstallDir |
| 43 |
|
|
else |
| 44 |
|
|
@@ -1176,14 +1176,14 @@ |
| 45 |
|
|
done |
| 46 |
|
|
} # FindLinuxESP() |
| 47 |
|
|
|
| 48 |
|
|
-# Identifies the ESP's location (/boot or /boot/efi, or these locations under |
| 49 |
|
|
+# Identifies the ESP's location (/boot or /boot/EFI, or these locations under |
| 50 |
|
|
# the directory specified by --root); aborts if the ESP isn't mounted at |
| 51 |
|
|
# either location. |
| 52 |
|
|
# Sets InstallDir to the ESP mount point. |
| 53 |
|
|
FindMountedESP() { |
| 54 |
|
|
mount /boot &> /dev/null |
| 55 |
|
|
- mount /boot/efi &> /dev/null |
| 56 |
|
|
- EspLine=`df "$RootDir/boot/efi" 2> /dev/null | grep boot/efi` |
| 57 |
|
|
+ mount /boot/EFI &> /dev/null |
| 58 |
|
|
+ EspLine=`df "$RootDir/boot/EFI" 2> /dev/null | grep boot/EFI` |
| 59 |
|
|
if [[ ! -n "$EspLine" ]] ; then |
| 60 |
|
|
EspLine=`df "$RootDir"/boot | grep boot` |
| 61 |
|
|
fi |
| 62 |
|
|
@@ -1197,7 +1197,7 @@ |
| 63 |
|
|
fi |
| 64 |
|
|
if [[ $EspFilesystem != 'vfat' ]] ; then |
| 65 |
|
|
echo "$RootDir/$InstallDir doesn't seem to be on a VFAT filesystem. The ESP must be" |
| 66 |
|
|
- echo "mounted at $RootDir/boot or $RootDir/boot/efi and it must be VFAT! Aborting!" |
| 67 |
|
|
+ echo "mounted at $RootDir/boot or $RootDir/boot/EFI and it must be VFAT! Aborting!" |
| 68 |
|
|
if [[ -d /sys/firmware/efi ]] ; then |
| 69 |
|
|
exit 1 |
| 70 |
|
|
else |
Parent Directory
| 
Revision Log