/[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 1583318 by martinw, Mon Dec 17 18:52:52 2018 UTC revision 1583319 by martinw, Tue May 12 10:42:49 2020 UTC
# Line 1  Line 1 
1  --- a/Make.common       2018-05-27 22:56:49.564527567 +0100  --- refind-0.12.0/Make.common.orig      2020-05-12 09:26:33.134781002 +0100
2  +++ b/Make.common       2018-05-27 23:10:22.681242272 +0100  +++ refind-0.12.0/Make.common   2020-05-12 09:28:13.623350600 +0100
3  @@ -17,10 +17,11 @@  @@ -17,10 +17,11 @@
4   # used to compile rEFInd....   # used to compile rEFInd....
5   #   #
# 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-12-16 17:14:36.990090411 +0000  --- refind-0.12.0/refind-install.orig   2020-05-12 09:15:03.231256311 +0100
19  +++ b/refind-install    2018-12-16 17:16:34.123509414 +0000  +++ refind-0.12.0/refind-install        2020-05-12 09:24:24.226770630 +0100
20  @@ -1136,8 +1136,8 @@  @@ -1217,19 +1217,23 @@
  } # ReSignBinaries()  
   
  # Locate and mount an ESP, if possible, based on parted output.  
 -# Should be called only if /boot/efi is NOT an acceptable ESP.  
 -# Sets InstallDir to the mounted ESP's path ($RootDir/boot/efi)  
 +# Should be called only if /boot/EFI is NOT an acceptable ESP.  
 +# Sets InstallDir to the mounted ESP's path ($RootDir/boot/EFI)  
  # and EspFilesystem the filesystem (always "vfat")  
  FindLinuxESP() {  
     echo "The ESP doesn't seem to be mounted! Trying to find it...."  
 @@ -1163,10 +1163,10 @@  
        if [[ $TableType == 'gpt' && $SkipIt == 0 ]] ; then # read only GPT disks that aren't part of dmraid array  
           PartNum=`LANG=C parted $Drive print -m -s 2>/dev/null | awk -F: '$7 ~ "(^boot| boot)" { print $1 }' | head -n 1`  
           if [ "$PartNum" -eq "$PartNum" ] 2> /dev/null ; then  
 -            InstallDir="$RootDir/boot/efi"  
 +            InstallDir="$RootDir/boot/EFI"  
              mkdir -p $InstallDir  
              mount $Drive$PartNum $InstallDir  
 -            EspFilesystem=`grep "$Drive$PartNum.*/boot/efi" /etc/mtab | uniq | grep -v autofs | cut -d " " -f 3`  
 +            EspFilesystem=`grep "$Drive$PartNum.*/boot/EFI" /etc/mtab | uniq | grep -v autofs | cut -d " " -f 3`  
              if [[ $EspFilesystem != 'vfat' ]] ; then  
                 umount $InstallDir  
              else  
 @@ -1178,17 +1178,17 @@  
21      done      done
22   } # FindLinuxESP()   } # FindLinuxESP()
23    
24  -# Identifies the ESP's location (/boot or /boot/efi, or these locations under  -# Identifies the ESP's location (/boot, /boot/efi, /efi, or these locations
25  +# Identifies the ESP's location (/boot or /boot/EFI, or these locations under  +# Identifies the ESP's location (/boot, /boot/efi, /boot/EFI, /efi, or these locations
26   # the directory specified by --root); aborts if the ESP isn't mounted at   # under the directory specified by --root); aborts if the ESP isn't mounted at
27   # either location.   # any of these locations.
28   # Sets InstallDir to the ESP mount point.   # Sets InstallDir to the ESP mount point.
29   FindMountedESP() {   FindMountedESP() {
30      mount /boot &> /dev/null      mount /boot &> /dev/null
31  -   mount /boot/efi &> /dev/null      mount /boot/efi &> /dev/null
32  +   mount /boot/EFI &> /dev/null  +   mount /boot/EFI &> /dev/null
33      mount /efi &> /dev/null      mount /efi &> /dev/null
34      EspLine=`df "$RootDir/efi" 2> /dev/null | grep efi`      EspLine=`df "$RootDir/efi" 2> /dev/null | grep efi`
35      if [[ ! -n "$EspLine" ]] ; then      if [[ ! -n "$EspLine" ]] ; then
36  -      EspLine=`df "$RootDir"/boot/efi 2> /dev/null | grep boot/efi`         EspLine=`df "$RootDir"/boot/efi 2> /dev/null | grep boot/efi`
 +      EspLine=`df "$RootDir"/boot/EFI 2> /dev/null | grep boot/EFI`  
37      fi      fi
38      if [[ ! -n "$EspLine" ]] ; then      if [[ ! -n "$EspLine" ]] ; then
39    +      EspLine=`df "$RootDir"/boot/EFI 2> /dev/null | grep boot/EFI`
40    +   fi
41    +   if [[ ! -n "$EspLine" ]] ; then
42         EspLine=`df "$RootDir"/boot 2> /dev/null | grep boot`         EspLine=`df "$RootDir"/boot 2> /dev/null | grep boot`
43  @@ -1203,7 +1203,7 @@      fi
44        InstallDir=`echo $EspLine | cut -d " " -f 6 | sed 's/\/\+/\//g'`
45    @@ -1242,8 +1246,8 @@
46      fi      fi
47      if [[ $EspFilesystem != 'vfat' ]] ; then      if [[ $EspFilesystem != 'vfat' ]] ; then
48         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"
49  -      echo "mounted at $RootDir/boot or $RootDir/boot/efi and it must be VFAT! Aborting!"  -      echo "mounted at $RootDir/boot, $RootDir/efi, or $RootDir/boot/efi, and it must be"
50  +      echo "mounted at $RootDir/boot or $RootDir/boot/EFI and it must be VFAT! Aborting!"  -      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         if [[ -d /sys/firmware/efi ]] ; then         if [[ -d /sys/firmware/efi ]] ; then
54            exit 1            exit 1
55         else         else
Legend:
Removed from v.1583318  
changed lines
  Added in v.1583319
  ViewVC Help
Powered by ViewVC 1.1.30