diff --git a/fs_mgr/fs_mgr_avb.cpp b/fs_mgr/fs_mgr_avb.cpp index a7620386f..7512eb934 100644 --- a/fs_mgr/fs_mgr_avb.cpp +++ b/fs_mgr/fs_mgr_avb.cpp @@ -390,10 +390,12 @@ static bool get_hashtree_descriptor(const std::string& partition_name, continue; } - // Ensures that hashtree descriptor is either in /vbmeta or in + // Ensures that hashtree descriptor is in /vbmeta or /boot or in // the same partition for verity setup. std::string vbmeta_partition_name(verify_data.vbmeta_images[i].partition_name); - if (vbmeta_partition_name != "vbmeta" && vbmeta_partition_name != partition_name) { + if (vbmeta_partition_name != "vbmeta" && + vbmeta_partition_name != "boot" && // for legacy device to append top-level vbmeta + vbmeta_partition_name != partition_name) { LWARNING << "Skip vbmeta image at " << verify_data.vbmeta_images[i].partition_name << " for partition: " << partition_name.c_str(); continue;