System76PayloadPkg: Wait for input on each boot failure

Signed-off-by: Tim Crawford <tcrawford@system76.com>

Author: crawfxrd

System76PayloadPkg/Library/BootManagerUiLib/BootManager.c

@@ -826,7 +826,6 @@ BootManagerCallback (
 {
   EFI_BOOT_MANAGER_LOAD_OPTION  *BootOption;
   UINTN                         BootOptionCount;
-  EFI_INPUT_KEY                 Key;
 
   if (Action == EFI_BROWSER_ACTION_FORM_OPEN) {
     //
@@ -871,14 +870,6 @@ BootManagerCallback (
   EfiBootManagerBoot (&BootOption[QuestionId - 1]);
   BmSetConsoleMode (TRUE);
 
-  if (EFI_ERROR (BootOption[QuestionId - 1].Status)) {
-    gST->ConOut->OutputString (
-                   gST->ConOut,
-                   HiiGetString (gBootManagerPrivate.HiiHandle, STRING_TOKEN (STR_ANY_KEY_CONTINUE), NULL)
-                   );
-    gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
-  }
-
   EfiBootManagerFreeLoadOptions (BootOption, BootOptionCount);
 
   return EFI_SUCCESS;

System76PayloadPkg/Library/BootManagerUiLib/BootManagerStrings.uni

@@ -5,6 +5,5 @@
 
 #string STR_BM_BANNER                 #language en-US "One Time Boot"
 #string STR_BOOT_MANAGER_HELP         #language en-US "Boot an entry one time"
-#string STR_ANY_KEY_CONTINUE          #language en-US "Press any key to continue..."
 #string STR_NO_BOOTABLE_MEDIA         #language en-US "No bootable media found"
 #string STR_EMPTY_STRING              #language en-US ""

System76PayloadPkg/Library/UefiBootManagerLib/BmBoot.c

@@ -2043,6 +2043,24 @@ EfiBootManagerBoot (
       //
       BmReportLoadFailure (EFI_SW_DXE_BS_EC_BOOT_OPTION_LOAD_ERROR, Status);
       BootOption->Status = Status;
+
+      if (gST->ConOut != NULL) {
+        gST->ConOut->ClearScreen (gST->ConOut);
+        AsciiPrint (
+            "Boot failed: %s\n"
+            "Press any key to continue...\n",
+            BootOption->Description
+        );
+      }
+      if (gST->ConIn != NULL) {
+        EFI_INPUT_KEY Key;
+        UINTN Index;
+
+        Status = gBS->WaitForEvent (1, &gST->ConIn->WaitForKey, &Index);
+        ASSERT_EFI_ERROR (Status);
+        ASSERT (Index == 0);
+        while (!EFI_ERROR (gST->ConIn->ReadKeyStroke (gST->ConIn, &Key))) {}
+      }
       return;
     }
   }