diff options
| author | Tom Rini <[email protected]> | 2026-06-22 16:42:41 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-06-22 16:42:41 -0600 |
| commit | 9f16b258e5632d74fa4a1c2c93bea4474e05234b (patch) | |
| tree | d7c5baa0d3c6027e9e43b16030e4e0ecd43b9d77 /boot | |
| parent | 298d44464dc63a4f3f5489150acd7958f359f9bd (diff) | |
| parent | f072620dc9ffda00b010783da27c41231c3a439b (diff) | |
Merge tag 'v2026.07-rc5' into next
Prepare v2026.07-rc5
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/android_ab.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/boot/android_ab.c b/boot/android_ab.c index 13e82dbcb7f..f2b1110aa24 100644 --- a/boot/android_ab.c +++ b/boot/android_ab.c @@ -289,11 +289,14 @@ int ab_select_slot(struct blk_desc *dev_desc, struct disk_partition *part_info, slot = -1; for (i = 0; i < abc->nb_slot; ++i) { if (abc->slot_info[i].verity_corrupted || - !abc->slot_info[i].tries_remaining) { + (!abc->slot_info[i].tries_remaining && + !abc->slot_info[i].successful_boot)) { log_debug("ANDROID: unbootable slot %d tries: %d, ", i, abc->slot_info[i].tries_remaining); - log_debug("corrupt: %d\n", + log_debug("corrupt: %d, ", abc->slot_info[i].verity_corrupted); + log_debug("successful: %d\n", + abc->slot_info[i].successful_boot); continue; } log_debug("ANDROID: bootable slot %d pri: %d, tries: %d, ", |