/[packages]/cauldron/refind/current/SOURCES/mga-system-path-fixes.patch
ViewVC logotype

Diff of /cauldron/refind/current/SOURCES/mga-system-path-fixes.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1342445 by martinw, Tue Sep 11 10:35:49 2018 UTC revision 1342446 by martinw, Mon Dec 17 18:52:52 2018 UTC
# Line 15  Line 15 
15    
16   # Comment out above and uncomment below if using locally-compiled GNU-EFI....   # Comment out above and uncomment below if using locally-compiled GNU-EFI....
17   #EFIINC          = /usr/local/include/efi   #EFIINC          = /usr/local/include/efi
18  --- a/refind-install    2018-05-27 23:57:45.891669565 +0100  --- a/refind-install    2018-12-16 17:14:36.990090411 +0000
19  +++ b/refind-install    2018-05-28 00:18:17.307657993 +0100  +++ b/refind-install    2018-12-16 17:16:34.123509414 +0000
20  @@ -1134,8 +1134,8 @@  @@ -1136,8 +1136,8 @@
21   } # ReSignBinaries()   } # ReSignBinaries()
22    
23   # Locate and mount an ESP, if possible, based on parted output.   # Locate and mount an ESP, if possible, based on parted output.
# Line 28  Line 28 
28   # and EspFilesystem the filesystem (always "vfat")   # and EspFilesystem the filesystem (always "vfat")
29   FindLinuxESP() {   FindLinuxESP() {
30      echo "The ESP doesn't seem to be mounted! Trying to find it...."      echo "The ESP doesn't seem to be mounted! Trying to find it...."
31  @@ -1161,10 +1161,10 @@  @@ -1163,10 +1163,10 @@
32         if [[ $TableType == 'gpt' && $SkipIt == 0 ]] ; then # read only GPT disks that aren't part of dmraid array         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`            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            if [ "$PartNum" -eq "$PartNum" ] 2> /dev/null ; then
# Line 41  Line 41 
41               if [[ $EspFilesystem != 'vfat' ]] ; then               if [[ $EspFilesystem != 'vfat' ]] ; then
42                  umount $InstallDir                  umount $InstallDir
43               else               else
44  @@ -1176,14 +1176,14 @@  @@ -1178,17 +1178,17 @@
45      done      done
46   } # FindLinuxESP()   } # FindLinuxESP()
47    
# Line 53  Line 53 
53   FindMountedESP() {   FindMountedESP() {
54      mount /boot &> /dev/null      mount /boot &> /dev/null
55  -   mount /boot/efi &> /dev/null  -   mount /boot/efi &> /dev/null
 -   EspLine=`df "$RootDir/boot/efi" 2> /dev/null | grep boot/efi`  
56  +   mount /boot/EFI &> /dev/null  +   mount /boot/EFI &> /dev/null
57  +   EspLine=`df "$RootDir/boot/EFI" 2> /dev/null | grep boot/EFI`      mount /efi &> /dev/null
58        EspLine=`df "$RootDir/efi" 2> /dev/null | grep efi`
59      if [[ ! -n "$EspLine" ]] ; then      if [[ ! -n "$EspLine" ]] ; then
60         EspLine=`df "$RootDir"/boot | grep boot`  -      EspLine=`df "$RootDir"/boot/efi 2> /dev/null | grep boot/efi`
61    +      EspLine=`df "$RootDir"/boot/EFI 2> /dev/null | grep boot/EFI`
62      fi      fi
63  @@ -1197,7 +1197,7 @@      if [[ ! -n "$EspLine" ]] ; then
64           EspLine=`df "$RootDir"/boot 2> /dev/null | grep boot`
65    @@ -1203,7 +1203,7 @@
66      fi      fi
67      if [[ $EspFilesystem != 'vfat' ]] ; then      if [[ $EspFilesystem != 'vfat' ]] ; then
68         echo "$RootDir/$InstallDir doesn't seem to be on a VFAT filesystem. The ESP must be"         echo "$RootDir/$InstallDir doesn't seem to be on a VFAT filesystem. The ESP must be"
Legend:
Removed from v.1342445  
changed lines
  Added in v.1342446
  ViewVC Help
Powered by ViewVC 1.1.30