diff options
| author | Connor O'Brien <connoro@google.com> | 2017-10-27 15:31:01 -0700 |
|---|---|---|
| committer | Connor O'Brien <connoro@google.com> | 2017-10-31 18:40:34 -0700 |
| commit | 8d5e2b337916fd8df3175f39e7b56e146a1f8ba3 (patch) | |
| tree | cf68156dca7977ce20d646e60cf0578e57fb2326 | |
| parent | 93a61da1e6caf7ed7c6ba935ead48f4f7fde4382 (diff) | |
| download | android_hardware_qcom_bootctrl-8d5e2b337916fd8df3175f39e7b56e146a1f8ba3.tar.gz android_hardware_qcom_bootctrl-8d5e2b337916fd8df3175f39e7b56e146a1f8ba3.tar.bz2 android_hardware_qcom_bootctrl-8d5e2b337916fd8df3175f39e7b56e146a1f8ba3.zip | |
bootcontrol: count slots correctly
Currently slots are miscounted on marlin because the count includes
both the bootlocker and boot partitions for each slot. Modify the
name used to find boot partitions to avoid this double counting. Add a
check to catch changes to slot suffixes that would break slot counting.
Bug: 68012387
Test: bootctl get-number-slots returns 2 on marlin
Change-Id: I5480273cf6de07fac2f47e4f8e249e2d547b686e
Signed-off-by: Connor O'Brien <connoro@google.com>
| -rw-r--r-- | boot_control.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/boot_control.cpp b/boot_control.cpp index 539c52c..912e382 100644 --- a/boot_control.cpp +++ b/boot_control.cpp @@ -49,7 +49,7 @@ extern "C" { #include "gpt-utils.h" #define BOOTDEV_DIR "/dev/block/bootdevice/by-name" -#define BOOT_IMG_PTN_NAME "boot" +#define BOOT_IMG_PTN_NAME "boot_" #define LUN_NAME_END_LOC 14 #define BOOT_SLOT_PROP "ro.boot.slot_suffix" @@ -266,6 +266,8 @@ unsigned get_number_slots(struct boot_control_module *module) while ((de = readdir(dir_bootdev))) { if (de->d_name[0] == '.') continue; + static_assert(AB_SLOT_A_SUFFIX[0] == '_', "Breaking change to slot A suffix"); + static_assert(AB_SLOT_B_SUFFIX[0] == '_', "Breaking change to slot B suffix"); if (!strncmp(de->d_name, BOOT_IMG_PTN_NAME, strlen(BOOT_IMG_PTN_NAME))) slot_count++; |