Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-09-21 02:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

search nvram.plist only on ESP partitions

Browse Source 
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
This commit is contained in:
SergeySlice 2021-02-21 18:30:06 +03:00
parent 76bf6321a6
commit 949da631b9
1 changed files with 94 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
rEFIt_UEFI/Platform/Nvram.cpp
View File

@ -880,58 +880,58 @@ LoadNvramPlist(
IN CONST CHAR16* NVRAMPlistPath IN CONST CHAR16* NVRAMPlistPath
) )
{ {
EFI_STATUS Status; EFI_STATUS Status;
CHAR8 *NvramPtr = NULL; CHAR8 *NvramPtr = NULL;
UINTN Size = 0; UINTN Size = 0;
DBG(" begin load gNvramDict=0x%llX\n", (uintptr_t)gNvramDict); DBG(" begin load gNvramDict=0x%llX\n", (uintptr_t)gNvramDict);
// //
// skip loading if already loaded // skip loading if already loaded
// //
if (gNvramDict != NULL) { if (gNvramDict != NULL) {
return EFI_SUCCESS; return EFI_SUCCESS;
} }
// //
// load nvram.plist // load nvram.plist
// //
Status = egLoadFile(RootDir, NVRAMPlistPath, (UINT8**)&NvramPtr, &Size); Status = egLoadFile(RootDir, NVRAMPlistPath, (UINT8**)&NvramPtr, &Size);
if(EFI_ERROR(Status)) { if(EFI_ERROR(Status)) {
DBG(" not present\n"); DBG(" not present\n");
return Status;
}
DBG(" loaded, size=%llu\n", Size);
//
// parse it into gNvramDict
//
Status = ParseXML((const CHAR8*)NvramPtr, &gNvramDict, Size);
if(Status != EFI_SUCCESS) {
DBG(" parsing error\n");
}
FreePool(NvramPtr);
// we will leave nvram.plist loaded and parsed for later processing
//FreeTag(gNvramDict);
return Status; return Status;
}
DBG(" loaded, size=%llu\n", Size);
//
// parse it into gNvramDict
//
Status = ParseXML((const CHAR8*)NvramPtr, &gNvramDict, Size);
if(Status != EFI_SUCCESS) {
DBG(" parsing error\n");
}
FreePool(NvramPtr);
// we will leave nvram.plist loaded and parsed for later processing
//FreeTag(gNvramDict);
return Status;
} }
#define SEARCH_ONLY_EFI 1
/** Searches all volumes for the most recent nvram.plist and loads it into gNvramDict. */ /** Searches all volumes for the most recent nvram.plist and loads it into gNvramDict. */
EFI_STATUS EFI_STATUS
LoadLatestNvramPlist() LoadLatestNvramPlist()
{ {
EFI_STATUS Status; EFI_STATUS Status;
// UINTN Index; EFI_FILE* FileHandle = NULL;
REFIT_VOLUME *Volume;
// EFI_GUID *Guid;
EFI_FILE* FileHandle = NULL;
EFI_FILE_INFO *FileInfo = NULL; EFI_FILE_INFO *FileInfo = NULL;
UINT64 LastModifTimeMs; UINT64 LastModifTimeMs;
UINT64 ModifTimeMs; UINT64 ModifTimeMs;
#if !SEARCH_ONLY_EFI
REFIT_VOLUME *Volume;
REFIT_VOLUME *VolumeWithLatestNvramPlist = NULL; REFIT_VOLUME *VolumeWithLatestNvramPlist = NULL;
#endif
//there are debug messages not needed for users //there are debug messages not needed for users
DBG("Searching volumes for latest nvram.plist ..."); DBG("Searching volumes for latest nvram.plist ...");
@ -950,7 +950,60 @@ LoadLatestNvramPlist()
// //
LastModifTimeMs = 0; LastModifTimeMs = 0;
#if SEARCH_ONLY_EFI
UINTN HandleCount = 0;
EFI_HANDLE *Handles = NULL;
EFI_FILE* RootDir;
EFI_FILE* NewestRootDir = NULL;
UINTN indexSuccess = 0;
Status = gBS->LocateHandleBuffer(ByProtocol, &gEfiPartTypeSystemPartGuid, NULL, &HandleCount, &Handles);
if (!EFI_ERROR(Status) && HandleCount > 0) {
for (UINTN indexHandle = 0; indexHandle < HandleCount; indexHandle++) {
RootDir = EfiLibOpenRoot(Handles[indexHandle]);
Status = RootDir->Open(RootDir, &FileHandle, L"nvram.plist", EFI_FILE_MODE_READ, 0);
if (EFI_ERROR(Status)) {
DBG(" - [%lld] no nvram.plist - skipping!\n", indexHandle);
continue;
}
FileInfo = EfiLibFileInfo(FileHandle);
// DBG("got FileInfo=0x%X\n", FileInfo);
if (FileInfo == NULL) {
DBG(" - no nvram.plist file info - skipping!\n");
FileHandle->Close(FileHandle);
continue;
}
DBG(" Modified = ");
ModifTimeMs = GetEfiTimeInMs (&(FileInfo->ModificationTime));
DBG("%d-%d-%d %d:%d:%d (%lld ms)\n",
FileInfo->ModificationTime.Year, FileInfo->ModificationTime.Month, FileInfo->ModificationTime.Day,
FileInfo->ModificationTime.Hour, FileInfo->ModificationTime.Minute, FileInfo->ModificationTime.Second,
ModifTimeMs);
FreePool(FileInfo);
FileHandle->Close(FileHandle);
// check if newer
if (LastModifTimeMs < ModifTimeMs) {
DBG(" - newer - will use this one\n");
NewestRootDir = RootDir;
LastModifTimeMs = ModifTimeMs;
indexSuccess = indexHandle;
}
}
if (NewestRootDir == NULL) {
Status = EFI_NOT_FOUND;
} else {
//
// if we have nvram.plist - load it
//
DBG("Loading nvram.plist from EFI index %lld", indexSuccess);
Status = LoadNvramPlist(NewestRootDir, L"nvram.plist");
}
FreePool(Handles);
}
#else
// search all volumes // search all volumes
for (UINTN Index = 0; Index < Volumes.size(); ++Index) { for (UINTN Index = 0; Index < Volumes.size(); ++Index) {
Volume = &Volumes[Index]; Volume = &Volumes[Index];
@ -1020,6 +1073,7 @@ LoadLatestNvramPlist()
// else { // else {
// DBG(" nvram.plist not found!\n"); // DBG(" nvram.plist not found!\n");
// } // }
#endif
DBG("loaded Status=%s\n", efiStrError(Status)); DBG("loaded Status=%s\n", efiStrError(Status));
return Status; return Status;
} }