From: Ruiyu Ni <ruiyu.ni@intel.com>
Date: Wed, 22 Jun 2016 06:00:41 +0000 (+0800)
Subject: Revert "MdeModulePkg/Bds: Do not boot to UI again when BootNext points to UI"
X-Git-Tag: edk2-stable201903~6806
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=59e2626181051dec0068bc4fcce9a88b9c8f084e;hp=cbedba8698b1a9f6e2e440219d03a263e09d2822

Revert "MdeModulePkg/Bds: Do not boot to UI again when BootNext points to UI"

This reverts commit dd85dd0731e971c5782fb94b2cbac8669b33312b.
---

diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
index 741ddc302b..3734ff954d 100644
--- a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
+++ b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
@@ -6,7 +6,7 @@
   to enter BDS phase.
 
 (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
-Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -923,10 +923,9 @@ BdsEntry (
       if (!EFI_ERROR (Status)) {
         EfiBootManagerBoot (&LoadOption);
         EfiBootManagerFreeLoadOption (&LoadOption);
-        if ((LoadOption.Status == EFI_SUCCESS) && (LoadOption.OptionNumber != BootManagerMenu.OptionNumber)) {
+        if (LoadOption.Status == EFI_SUCCESS) {
           //
           // Boot to Boot Manager Menu upon EFI_SUCCESS
-          // Exception: Do not boot again when the BootNext points to Boot Manager Menu.
           //
           EfiBootManagerBoot (&BootManagerMenu);
         }