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

Commit 53c5c623 authored by Alistair Strachan's avatar Alistair Strachan
Browse files

Skip logical partitions in non-AVB2 case too 

Follow up to the change made for AVB2 devices in
I19371b05912240480dc50864a2c04131258a7103.

The same consideration must be made in the fall through case, which
is taken either if AVB is completely disabled, or the dm-verity / AVB1
mechanism is used.

Bug: 113175337
Test: boot test on cuttlefish
Change-Id: I99d46a2c2630c40f5f5c02279b11e423998a1e05
parent 0685af0f

init/first_stage_mount.cpp

+3 −1
Original line number Diff line number Diff line
@@ -449,8 +449,10 @@ bool FirstStageMountVBootV1::GetDmVerityDevices() { 
    // Includes the partition names of fstab records and verity_loc_device (if any).

    // Notes that fstab_rec->blk_device has A/B suffix updated by fs_mgr when A/B is used.

    for (auto fstab_rec : mount_fstab_recs_) {

        if (!fs_mgr_is_logical(fstab_rec)) {

            required_devices_partition_names_.emplace(basename(fstab_rec->blk_device));

        }

    }



    if (!verity_loc_device.empty()) {

        required_devices_partition_names_.emplace(basename(verity_loc_device.c_str()));