Oops. Must still distinguish "no disks" from "no valid disks".

The fix for chrome-os-partner:7715 introduced a new bug. This fixes that.

BUG=chrome-os-partner:7775
TEST=manual

Boot into recovery mode.
Insert invalid USB.

You should see the YUCK screen.

Change-Id: I868287eecd34bb0c48127bee04f573b418f5945c
Reviewed-on: https://gerrit.chromium.org/gerrit/14963
Commit-Ready: Bill Richardson <wfrichar@chromium.org>
Tested-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
This commit is contained in:
Bill Richardson
2012-01-27 10:45:02 -08:00
committed by Stefan Reinauer
parent b5cf3f30cc
commit cbfc6dbd23

View File

@@ -96,7 +96,6 @@ uint32_t VbTryLoadKernel(VbCommonParams* cparams, LoadKernelParams* p,
/* If we didn't succeed, don't return a disk handle */ /* If we didn't succeed, don't return a disk handle */
if (VBERROR_SUCCESS != retval) { if (VBERROR_SUCCESS != retval) {
VbSetRecoveryRequest(VBNV_RECOVERY_RW_NO_DISK); VbSetRecoveryRequest(VBNV_RECOVERY_RW_NO_DISK);
retval = VBERROR_NO_DISK_FOUND;
p->disk_handle = NULL; p->disk_handle = NULL;
} }