PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "update_verifier: Track the API change for isSlotBootable()."

Browse Source
This commit is contained in:
Tao Bao
2015-12-11 04:53:48 +00:00
committed by Gerrit Code Review
parent ca18526760 612161ef1c
commit e062645efa
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
update_verifier/update_verifier.cpp
+6 -5
View File
@@ -23,7 +23,8 @@
* verified. dm-verity must be in enforcing mode, so that it will reboot the * verified. dm-verity must be in enforcing mode, so that it will reboot the
* device on dm-verity failures. When that happens, the bootloader should * device on dm-verity failures. When that happens, the bootloader should
* mark the slot as unbootable and stops trying. We should never see a device * mark the slot as unbootable and stops trying. We should never see a device
* started in dm-verity logging mode but with isSlotBootable equals to 0. * started in dm-verity logging mode but with isSlotMarkedSuccessful equals to
* 0.
* *
* The current slot will be marked as having booted successfully if the * The current slot will be marked as having booted successfully if the
* verifier reaches the end after the verification. * verifier reaches the end after the verification.
@@ -55,17 +56,17 @@ int main(int argc, char** argv) {
module->init(module); module->init(module);
unsigned current_slot = module->getCurrentSlot(module); unsigned current_slot = module->getCurrentSlot(module);
int bootable = module->isSlotBootable(module, current_slot); int is_successful= module->isSlotMarkedSuccessful(module, current_slot);
SLOGI("Booting slot %u: isSlotBootable=%d\n", current_slot, bootable); SLOGI("Booting slot %u: isSlotMarkedSuccessful=%d\n", current_slot, is_successful);
if (bootable == 0) { if (is_successful == 0) {
// The current slot has not booted successfully. // The current slot has not booted successfully.
// TODO: Add the actual verification after we have the A/B OTA package // TODO: Add the actual verification after we have the A/B OTA package
// format in place. // format in place.
// TODO: Assert the dm-verity mode. Bootloader should never boot a newly // TODO: Assert the dm-verity mode. Bootloader should never boot a newly
// flashed slot (isSlotBootable == 0) with dm-verity logging mode. // flashed slot (isSlotMarkedSuccessful == 0) with dm-verity logging mode.
int ret = module->markBootSuccessful(module); int ret = module->markBootSuccessful(module);
if (ret != 0) { if (ret != 0) {