mirror of
https://github.com/CloverHackyColor/CloverBootloader.git
synced 2024-11-23 11:35:19 +01:00
Avoid having main BS partition in Menu.
This commit is contained in:
parent
d4afee825b
commit
982a43f3e3
@ -1411,11 +1411,46 @@ void ScanLoader(void)
|
||||
} else if (FileExists(Volume->RootDir, L"\\System\\Library\\CoreServices\\NotificationCenter.app") && !FileExists(Volume->RootDir, L"\\System\\Library\\CoreServices\\Siri.app")) {
|
||||
AddLoaderEntry(MACOSX_LOADER_PATH, NullXString8Array, L""_XSW, L"OS X"_XSW, Volume, L""_XSW, NULL, OSTYPE_OSX, 0); // 10.8 - 10.11
|
||||
} else {
|
||||
XString8 OSVersion;
|
||||
if ( Volume->ApfsFileSystemUUID.notEmpty() && Volume->ApfsTargetUUIDArray.size() == 0 )
|
||||
{
|
||||
XStringW plist = SWPrintf("\\System\\Library\\CoreServices\\SystemVersion.plist");
|
||||
if ( !FileExists(Volume->RootDir, plist) ) {
|
||||
plist = SWPrintf("\\System\\Library\\CoreServices\\ServerVersion.plist");
|
||||
if ( !FileExists(Volume->RootDir, plist) ) {
|
||||
plist.setEmpty();
|
||||
}
|
||||
}
|
||||
|
||||
if ( plist.notEmpty() ) { // found macOS System
|
||||
CHAR8* PlistBuffer = NULL;
|
||||
UINTN PlistLen;
|
||||
TagDict* Dict = NULL;
|
||||
const TagStruct* Prop = NULL;
|
||||
|
||||
EFI_STATUS Status = egLoadFile(Volume->RootDir, plist.wc_str(), (UINT8 **)&PlistBuffer, &PlistLen);
|
||||
if (!EFI_ERROR(Status) && PlistBuffer != NULL && ParseXML(PlistBuffer, &Dict, 0) == EFI_SUCCESS) {
|
||||
Prop = Dict->propertyForKey("ProductVersion");
|
||||
if ( Prop != NULL ) {
|
||||
if ( !Prop->isString() ) {
|
||||
MsgLog("ATTENTION : property not string in ProductVersion\n");
|
||||
}else{
|
||||
if( Prop->getString()->stringValue().notEmpty() ) {
|
||||
OSVersion = Prop->getString()->stringValue();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if ( PlistBuffer ) FreePool(PlistBuffer);
|
||||
}
|
||||
}
|
||||
if ( OSVersion.isEmpty() || !OSVersion.equal("11.0") ) {
|
||||
AddLoaderEntry(MACOSX_LOADER_PATH, NullXString8Array, L""_XSW, L"macOS"_XSW, Volume, L""_XSW, NULL, OSTYPE_OSX, 0); // 10.12+
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// check for Mac OS X Recovery Boot
|
||||
AddLoaderEntry(L"\\com.apple.recovery.boot\\boot.efi"_XSW, NullXString8Array, L""_XSW, L"Recovery"_XSW, Volume, L""_XSW, NULL, OSTYPE_RECOVERY, 0);
|
||||
|
Loading…
Reference in New Issue
Block a user