tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OvmfPkg/BdsPlatform: don't restore NvVars from disk when flash is present 

QemuFlashFvbServicesRuntimeDxe provides actual persistent storage for
non-volatile variables. When it is active, any on-disk NvVars file counts
as a stale source of variables -- hence don't load these files in BDS.

This also allows Secure Boot settings (eg. enrolled keys) to survive cold
VM reboots.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14844 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Laszlo Ersek 2013-11-12 18:35:32 +00:00 committed by jljusten
parent 9d35ac2611
commit 2590861a5b
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
View File

@ -1073,11 +1073,16 @@ Returns:
ConnectRootBridge (); ConnectRootBridge ();
// if (PcdGetBool (PcdOvmfFlashVariablesEnable)) {
// Try to restore variables from the hard disk early so DEBUG ((EFI_D_INFO, "PlatformBdsPolicyBehavior: not restoring NvVars "
// they can be used for the other BDS connect operations. "from disk since flash variables appear to be supported.\n"));
// } else {
PlatformBdsRestoreNvVarsFromHardDisk (); //
// Try to restore variables from the hard disk early so
// they can be used for the other BDS connect operations.
//
PlatformBdsRestoreNvVarsFromHardDisk ();
}
// //
// Init the time out value // Init the time out value

1
OvmfPkg/Library/PlatformBdsLib/PlatformBdsLib.inf
View File

@ -57,6 +57,7 @@
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile
gUefiOvmfPkgTokenSpaceGuid.PcdEmuVariableEvent gUefiOvmfPkgTokenSpaceGuid.PcdEmuVariableEvent
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashVariablesEnable
[Pcd.IA32, Pcd.X64] [Pcd.IA32, Pcd.X64]
gEfiMdePkgTokenSpaceGuid.PcdFSBClock gEfiMdePkgTokenSpaceGuid.PcdFSBClock