archive-gh-me/OpenCorePkg
1
0
Fork 0
mirror of https://github.com/acidanthera/OpenCorePkg.git synced 2025-12-08 19:25:01 +00:00
Code Issues Projects Releases Wiki Activity

OcAppleBootPolicyLib: Initial fix to multiple os

Browse Source
This commit is contained in:
vit9696 2019-07-21 14:02:11 +03:00
parent 45c6001982
commit 47caf2854c
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Library/OcAppleBootPolicyLib/OcAppleBootPolicyLib.c
View File

@ -924,6 +924,7 @@ BootPolicyGetBootFileEx (
)
{
EFI_STATUS Status;
EFI_STATUS TmpStatus;
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *FileSystem;
EFI_FILE_PROTOCOL *Root;
@ -953,19 +954,24 @@ BootPolicyGetBootFileEx (
if (!EFI_ERROR (Status)) {
Status = EFI_NOT_FOUND;
if ((VolumeInfo->Role & APPLE_APFS_VOLUME_ROLE_PREBOOT) != 0) {
Status = InternalGetBooterFromBlessedSystemFilePath (Root, FilePath);
if (EFI_ERROR (Status)) {
Status = InternalGetBooterFromBlessedSystemFolderPath (Device, Root, FilePath);
if (EFI_ERROR (Status)) {
Status = InternalGetBooterFromApfsPredefinedNameList (
Device,
Root,
&ContainerInfo->Uuid,
NULL,
FilePath,
NULL
);
}
TmpStatus = InternalGetBooterFromBlessedSystemFilePath (Root, FilePath);
if (EFI_ERROR (TmpStatus)) {
TmpStatus = InternalGetBooterFromBlessedSystemFolderPath (Device, Root, FilePath);
}
//
// Blessed entry is always first, and subsequent entries are added with deduplication.
//
Status = InternalGetBooterFromApfsPredefinedNameList (
Device,
Root,
&ContainerInfo->Uuid,
NULL,
FilePath,
NULL
);
if (!EFI_ERROR (TmpStatus)) {
Status = TmpStatus;
}
}