Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-12-01 12:53:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

first found volume is not good enough

Browse Source 
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
This commit is contained in:
SergeySlice 2022-03-10 19:48:39 +03:00
parent e6d2d6ab7b
commit aab98d9408
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rEFIt_UEFI/refit/main.cpp
View File

@ -1187,6 +1187,9 @@ void LOADER_ENTRY::StartLoader()
XBool NoContents = false; XBool NoContents = false;
REFIT_VOLUME * SystemVolume = Volume; REFIT_VOLUME * SystemVolume = Volume;
EFI_FILE* SysRoot = Volume->RootDir; EFI_FILE* SysRoot = Volume->RootDir;
XStringW infoPlistPath;
const XStringW empty;
TagDict* dictInfo;
if (Volume->ApfsRole == APPLE_APFS_VOLUME_ROLE_PREBOOT) { if (Volume->ApfsRole == APPLE_APFS_VOLUME_ROLE_PREBOOT) {
//search for other partition //search for other partition
DBG("boot from Preboot, index=%llu\n", Volume->Index); DBG("boot from Preboot, index=%llu\n", Volume->Index);
@ -1195,8 +1198,12 @@ void LOADER_ENTRY::StartLoader()
for (sysIndex=Volume->Index+1; sysIndex < numbers; sysIndex++) { for (sysIndex=Volume->Index+1; sysIndex < numbers; sysIndex++) {
SystemVolume = &Volumes[sysIndex]; SystemVolume = &Volumes[sysIndex];
SysRoot = SystemVolume->RootDir; SysRoot = SystemVolume->RootDir;
if (FileExists(SysRoot, L"\\System\\Library\\CoreServices\\boot.efi" )) break; infoPlistPath = getKextPlist(SysRoot, empty, forceKext, &NoContents);
DBG("volume %ls has no boot.efi\n", SystemVolume->VolName.wc_str()); dictInfo = getInfoPlist(SysRoot, infoPlistPath);
if (dictInfo) {
DBG("Info.plist at %ls\n", infoPlistPath.wc_str());
break;
}
SysRoot = NULL; SysRoot = NULL;
} }
if (SysRoot != NULL) { if (SysRoot != NULL) {
@ -1206,18 +1213,13 @@ void LOADER_ENTRY::StartLoader()
DBG("failed to find sysroot\n"); DBG("failed to find sysroot\n");
} }
} }
const XStringW empty; // = SWPrintf("\\"); //empty.setEmpty();
XStringW infoPlistPath = getKextPlist(SysRoot, empty, forceKext, &NoContents); //it will be fullPath, including dir
TagDict* dictInfo = getInfoPlist(SysRoot, infoPlistPath);
if (dictInfo) {
DBG("Info.plist at %ls\n", infoPlistPath.wc_str());
}
XString8 execpath = getKextExecPath(SysRoot, empty, forceKext, dictInfo, NoContents); XString8 execpath = getKextExecPath(SysRoot, empty, forceKext, dictInfo, NoContents);
// for kext IOAudioFamily BundlePath = System\Library\Extensions\IOAudioFamily.kext // for kext IOAudioFamily BundlePath = System\Library\Extensions\IOAudioFamily.kext
// ExecutablePath = Contents/MacOS/IOAudioFamily // ExecutablePath = Contents/MacOS/IOAudioFamily
if ( FileExists(Volume->RootDir, forceKext.wc_str()) ) { if ( FileExists(SysRoot, forceKext.wc_str()) ) {
OC_STRING_ASSIGN(mOpenCoreConfiguration.Kernel.Force.Values[kextIdx]->BundlePath, S8Printf("%ls",forceKext.wc_str()).c_str()); OC_STRING_ASSIGN(mOpenCoreConfiguration.Kernel.Force.Values[kextIdx]->BundlePath, S8Printf("%ls",forceKext.wc_str()).c_str());
}else{ }else{
DBG("Cannot find kext bundlePath at '%s'\n", S8Printf("%ls",forceKext.wc_str()).c_str()); DBG("Cannot find kext bundlePath at '%s'\n", S8Printf("%ls",forceKext.wc_str()).c_str());