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

Commit 4f2d673c authored by Kamaljeet Maini's avatar Kamaljeet Maini Committed by Automerger Merge Worker
Browse files

Merge "Allow disabling AVB on special vbmeta partitions" am: a08ebb30 am:... 

Merge "Allow disabling AVB on special vbmeta partitions" am: a08ebb30 am: 3d246af8 am: 49882b31

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1618979

Change-Id: I07650e9ddfd0308fb4e977d0cc3783a78fed2372
parents 74402be9 49882b31

fastboot/fastboot.cpp

+5 −1
Original line number Diff line number Diff line
@@ -1084,7 +1084,11 @@ static void flash_buf(const std::string& partition, struct fastboot_buffer *buf) 


    // Rewrite vbmeta if that's what we're flashing and modification has been requested.

    if (g_disable_verity || g_disable_verification) {

        if (partition == "vbmeta" || partition == "vbmeta_a" || partition == "vbmeta_b") {

        // The vbmeta partition might have additional prefix if running in virtual machine

        // e.g., guest_vbmeta_a.

        if (android::base::EndsWith(partition, "vbmeta") ||

            android::base::EndsWith(partition, "vbmeta_a") ||

            android::base::EndsWith(partition, "vbmeta_b")) {

            rewrite_vbmeta_buffer(buf, false /* vbmeta_in_boot */);

        } else if (!has_vbmeta_partition() &&

                   (partition == "boot" || partition == "boot_a" || partition == "boot_b")) {