Skip volumes that do not have an EFI volume

2020-01-27 15:32:04 -07:00
parent 55849a4a46
commit 3f54e8f57a
1 changed files with 7 additions and 0 deletions
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
@ -3277,6 +3277,13 @@ BdsLibEnumerateAllBootOption (
      DevicePath  = DevicePathFromHandle (BlockIoHandles[Index]);
      DevicePathType = BdsGetBootTypeFromDevicePath (DevicePath);

+      //
+      // Skip devices that do not have an EFI volume
+      //
+      if (BdsLibGetBootableHandle (DevicePath) == NULL) {
+        continue;
+      }
+
      // Do NVMe devices first, all others second
      if (DPTIndex == 0) {
        if (DevicePathType != BDS_EFI_MESSAGE_NVME_BOOT) {