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

Commit 006723f1 authored by Alistair Strachan's avatar Alistair Strachan Committed by android-build-merger
Browse files

Merge changes I99d46a2c,I6ff460d0 am: ef983596 

am: 45415605

Change-Id: Ic790e609566cb2e35c81b2cf1b5fd2742579135a
parents 33ada14d 45415605

fs_mgr/fs_mgr.cpp

+0 −3
Original line number Original line Diff line number Diff line
@@ -1603,9 +1603,6 @@ std::string fs_mgr_get_super_partition_name(int slot) { 
        } else if (slot == -1) {

        } else if (slot == -1) {

            suffix = fs_mgr_get_slot_suffix();

            suffix = fs_mgr_get_slot_suffix();

        }

        }

        if (suffix.empty()) {

            LFATAL << "Super partition name can only be overridden on A/B devices.";

        }

        return super_partition + suffix;

        return super_partition + suffix;

    }

    }

    return LP_METADATA_DEFAULT_PARTITION_NAME;

    return LP_METADATA_DEFAULT_PARTITION_NAME;

init/first_stage_mount.cpp

+3 −1
Original line number Original line 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).

    // 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.

    // 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_) {

    for (auto fstab_rec : mount_fstab_recs_) {

        if (!fs_mgr_is_logical(fstab_rec)) {

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

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

        }

        }

    }





    if (!verity_loc_device.empty()) {

    if (!verity_loc_device.empty()) {

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

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