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

Commit 59cc4357 authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge "fs_mgr: Add force_super_partition bootconfig option to avoid slot... 

Merge "fs_mgr: Add force_super_partition bootconfig option to avoid slot suffixing alternate super partition names." am: b738b7d2

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

Change-Id: Ic47f79da15acfda4b4f7dac2d49ea249d758bce1
parents bb9525cb b738b7d2

fs_mgr/fs_mgr.cpp

+4 −2
Original line number Diff line number Diff line
@@ -2208,8 +2208,10 @@ std::string fs_mgr_get_super_partition_name(int slot) { 
    // Devices upgrading to dynamic partitions are allowed to specify a super

    // partition name. This includes cuttlefish, which is a non-A/B device.

    std::string super_partition;

    if (fs_mgr_get_boot_config_from_bootconfig_source("super_partition", &super_partition) ||

        fs_mgr_get_boot_config_from_kernel_cmdline("super_partition", &super_partition)) {

    if (fs_mgr_get_boot_config("force_super_partition", &super_partition)) {

        return super_partition;

    }

    if (fs_mgr_get_boot_config("super_partition", &super_partition)) {

        if (fs_mgr_get_slot_suffix().empty()) {

            return super_partition;

        }