Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24375323 authored by Bowgo Tsai's avatar Bowgo Tsai Committed by android-build-merger
Browse files

Merge "fs_mgr_avb: allow top-level vbmeta struct to be in 'boot' partition"... 

Merge "fs_mgr_avb: allow top-level vbmeta struct to be in 'boot' partition" am: 2e0f8a3b am: ec10a51d
am: 1c7f528f

Change-Id: Idd0ebe9ad12c622732e29dc2b4747bd2b5c78602
parents 700f3d2e 1c7f528f

fs_mgr/fs_mgr_avb.cpp

+4 −2
Original line number Diff line number Diff line
@@ -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;