From 1bc8dcd92f38b12fe16fc7fdeb682e7d2f9a7ab5 Mon Sep 17 00:00:00 2001 From: Tom Cherry Date: Fri, 9 Nov 2018 10:13:13 -0800 Subject: [PATCH] fs_mgr: remove same partition check for vbmeta With chained vbmeta and especially its use with dynamic partitions, this check is no longer always true. A concrete example is the chained vbmeta_system partition that contains the metadata for /system and /product_services for mainline devices. Test: blueline_mainline boots with AVB enabled Change-Id: Ib4115831bb3bb49bf6d2a908df59ba32f8405de7 --- fs_mgr/fs_mgr_avb.cpp | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/fs_mgr/fs_mgr_avb.cpp b/fs_mgr/fs_mgr_avb.cpp index 7c6093e14..31affbe7d 100644 --- a/fs_mgr/fs_mgr_avb.cpp +++ b/fs_mgr/fs_mgr_avb.cpp @@ -322,17 +322,6 @@ static bool get_hashtree_descriptor(const std::string& partition_name, continue; } - // 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 != "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; - } - for (size_t j = 0; j < num_descriptors && !found; j++) { AvbDescriptor desc; if (!avb_descriptor_validate_and_byteswap(descriptors[j], &desc)) {