Always treat invalid images as nonexistant now.

This makes the sequence of pictures shown to the user slightly less
confusing, but the whole process needs a bit more cleanup. Some of the work
has to be done in the BIOS code, not just here. This is better, but it's not
complete.

Change-Id: If0b3ecc92716020a06031866849d83411d7f0db8

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

Review URL: http://codereview.chromium.org/3249009
This commit is contained in:
Bill Richardson
2010-08-30 15:15:38 -07:00
parent 2447dd256f
commit 60563ee0af
2 changed files with 7 additions and 6 deletions

View File

@@ -429,9 +429,10 @@ int LoadKernel(LoadKernelParams* params) {
return LOAD_KERNEL_SUCCESS;
}
// Handle error cases
if (found_partitions)
/* The BIOS may attempt to display different screens depending on whether
* we find an invalid kernel partition (return LOAD_KERNEL_INVALID) or not.
* But the flow is changing, so for now treating both cases as invalid gives
* slightly less confusing user feedback. Sigh.
*/
return LOAD_KERNEL_INVALID;
else
return LOAD_KERNEL_NOT_FOUND;
}

View File

@@ -1 +1 @@
char* VbootVersion = "VBOOv=b4df7bb0";
char* VbootVersion = "VBOOv=2c899e79";