Mageia Bugzilla – Attachment 8128 Details for
Bug 15153
Patches to add support for the rEFInd boot manager in drakboot
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
refidn-install: adapt to Mageia's /boot/EFI
refind-02.patch (text/plain), 2.52 KB, created by
Thierry Vignaud
on 2016-07-05 10:41:53 CEST
(
hide
)
Description:
refidn-install: adapt to Mageia's /boot/EFI
Filename:
MIME Type:
Creator:
Thierry Vignaud
Created:
2016-07-05 10:41:53 CEST
Size:
2.52 KB
patch
obsolete
>--- /sbin/refind-install.tv2 2016-07-05 04:32:04.973000000 -0400 >+++ /sbin/refind-install 2016-07-05 04:36:57.822000000 -0400 >@@ -1047,8 +1047,8 @@ > } # 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...." >@@ -1072,10 +1072,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 >@@ -1087,14 +1087,14 @@ > done > } # FindLinuxESP() > >-# Identifies the ESP's location (/boot or /boot/efi, or these locations under >+# Identifies the ESP's location (/boot or /boot/EFI, or these locations under > # the directory specified by --root); aborts if the ESP isn't mounted at > # either location. > # Sets InstallDir to the ESP mount point. > FindMountedESP() { > mount /boot &> /dev/null >- mount /boot/efi &> /dev/null >- EspLine=`df "$RootDir/boot/efi" 2> /dev/null | grep boot/efi` >+ mount /boot/EFI &> /dev/null >+ EspLine=`df "$RootDir/boot/EFI" 2> /dev/null | grep boot/EFI` > if [[ ! -n "$EspLine" ]] ; then > EspLine=`df "$RootDir"/boot | grep boot` > fi >@@ -1108,7 +1108,7 @@ > fi > if [[ $EspFilesystem != 'vfat' ]] ; then > echo "$RootDir/$InstallDir doesn't seem to be on a VFAT filesystem. The ESP must be" >- echo "mounted at $RootDir/boot or $RootDir/boot/efi and it must be VFAT! Aborting!" >+ echo "mounted at $RootDir/boot or $RootDir/boot/EFI and it must be VFAT! Aborting!" > exit 1 > fi > echo "ESP was found at $InstallDir using $EspFilesystem"
--- /sbin/refind-install.tv2 2016-07-05 04:32:04.973000000 -0400 +++ /sbin/refind-install 2016-07-05 04:36:57.822000000 -0400 @@ -1047,8 +1047,8 @@ } # 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...." @@ -1072,10 +1072,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 @@ -1087,14 +1087,14 @@ done } # FindLinuxESP() -# Identifies the ESP's location (/boot or /boot/efi, or these locations under +# Identifies the ESP's location (/boot or /boot/EFI, or these locations under # the directory specified by --root); aborts if the ESP isn't mounted at # either location. # Sets InstallDir to the ESP mount point. FindMountedESP() { mount /boot &> /dev/null - mount /boot/efi &> /dev/null - EspLine=`df "$RootDir/boot/efi" 2> /dev/null | grep boot/efi` + mount /boot/EFI &> /dev/null + EspLine=`df "$RootDir/boot/EFI" 2> /dev/null | grep boot/EFI` if [[ ! -n "$EspLine" ]] ; then EspLine=`df "$RootDir"/boot | grep boot` fi @@ -1108,7 +1108,7 @@ fi if [[ $EspFilesystem != 'vfat' ]] ; then echo "$RootDir/$InstallDir doesn't seem to be on a VFAT filesystem. The ESP must be" - echo "mounted at $RootDir/boot or $RootDir/boot/efi and it must be VFAT! Aborting!" + echo "mounted at $RootDir/boot or $RootDir/boot/EFI and it must be VFAT! Aborting!" exit 1 fi echo "ESP was found at $InstallDir using $EspFilesystem"
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 15153
:
5844
|
5845
|
5932
|
5933
|
5936
|
5975
|
6187
|
6188
|
6308
|
8124
|
8125
|
8126
|
8127
| 8128 |
10371