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>
diff --git a/firmware/2lib/2ui_screens.c b/firmware/2lib/2ui_screens.c
index 0c9efe1..3156fb5 100644
--- a/firmware/2lib/2ui_screens.c
+++ b/firmware/2lib/2ui_screens.c
@@ -291,11 +291,7 @@
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;
}
