diff options
| author | Yu-Ping Wu <yupingso@chromium.org> | 2020-05-25 15:47:41 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-05-27 13:03:47 +0000 |
| commit | 0bbd72df633a90258d8f5203614ef16258c25a00 (patch) | |
| tree | 449966c94b6da60d2b371350fe4bab03f429ef6b /firmware | |
| parent | 319412dcce177b2cd2f1d4c5ea94506905a8cc27 (diff) | |
| download | vboot-0bbd72df633a90258d8f5203614ef16258c25a00.tar.gz | |
vboot/ui: return error if booting from internal failed
When booting from internal disk failed, return error and request
recovery. This behavior is consistent with legacy UIs, and is necessary
for FAFT firmware_CorruptBothKernelAB.dev to pass.
BRANCH=none
BUG=b:146399181, b:156880836
TEST=make runtests
TEST=firmware_CorruptBothKernelAB.dev passed on puff
Change-Id: Id927961ec7fa1788ddd817c133b5bc905b1e8335
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2213210
Reviewed-by: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/2lib/2ui_screens.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/firmware/2lib/2ui_screens.c b/firmware/2lib/2ui_screens.c index 0c9efe1b..3156fb51 100644 --- a/firmware/2lib/2ui_screens.c +++ b/firmware/2lib/2ui_screens.c @@ -291,11 +291,7 @@ vb2_error_t vb2_ui_developer_mode_boot_internal_action( return VB2_REQUEST_UI_CONTINUE; } - if (VbTryLoadKernel(ui->ctx, VB_DISK_FLAG_FIXED)) { - VB2_DEBUG("ERROR: Dev mode internal boot failed\n"); - return VB2_REQUEST_UI_CONTINUE; - } - + VB2_TRY(VbTryLoadKernel(ui->ctx, VB_DISK_FLAG_FIXED)); return VB2_SUCCESS; } |