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

Commit ff9cfac0 authored by Paweł Grabas's avatar Paweł Grabas Committed by Kamaljeet Maini
Browse files

Allow disabling AVB on special vbmeta partitions 

The vbmeta partition might have additional prefix
(e.g., guest_vbmeta_a) on some virtual machine
environment. Allowing rewriting the disable-verity/
disable-verification bits in the vbmeta image upon
flash under such use case.

Bug: https://partnerissuetracker.corp.google.com/u/1/issues/181791553
Test: manual tests with different names of vbmeta partition
Change-Id: Iacadaf587fce1e1e7fef946f56bbfc7f4e8233d8
parent eb710bfa

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")) {