On 8 July 2016 at 12:31, Laszlo Ersek <ler...@redhat.com> wrote: > This patch ports Gary's OvmfPkg commit 14b2ebc30c8b to ArmVirtPkg. > > Turns out Gary's argument in 14b2ebc30c8b is not only valid for Xen. The > same situation arises with QEMU if: > - the user specifies no boot order via fw_cfg at all (so QemuBootOrderLib > won't touch the boot order), and > - the varstore file has just been created from the varstore template. > > In this case the user is dropped to the UEFI shell (because the shell is > registered earlier than all the auto-generated options), which is likely > not what the user wants. > > Cc: Ard Biesheuvel <ard.biesheu...@linaro.org> > Cc: Gary Lin <g...@suse.com > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Laszlo Ersek <ler...@redhat.com>
Reviewed-by: Ard Biesheuvel <ard.biesheu...@linaro.org> > --- > ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c > b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c > index 198d0602b3c0..eaafe7ff57ea 100644 > --- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c > +++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c > @@ -424,12 +424,6 @@ PlatformRegisterOptionsAndKeys ( > NULL, (UINT16) BootOption.OptionNumber, 0, &Esc, NULL > ); > ASSERT (Status == EFI_SUCCESS || Status == EFI_ALREADY_STARTED); > - // > - // Register UEFI Shell > - // > - PlatformRegisterFvBootOption ( > - PcdGetPtr (PcdShellFile), L"EFI Internal Shell", LOAD_OPTION_ACTIVE > - ); > } > > > @@ -558,6 +552,14 @@ PlatformBootManagerAfterConsole ( > // the QEMU configuration. > // > EfiBootManagerRefreshAllBootOption (); > + > + // > + // Register UEFI Shell > + // > + PlatformRegisterFvBootOption ( > + PcdGetPtr (PcdShellFile), L"EFI Internal Shell", LOAD_OPTION_ACTIVE > + ); > + > SetBootOrderFromQemu (); > } > > -- > 1.8.3.1 > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
