From dac0476112e35eda6281b53b8e172c52233528ed Mon Sep 17 00:00:00 2001 From: David Anderson Date: Mon, 28 Feb 2022 21:38:38 -0800 Subject: [PATCH] fs_mgr: Add force_super_partition bootconfig option to avoid slot suffixing alternate super partition names. Bug: 171024225 Test: manual test Change-Id: I279b8fc6878036b3a3bc767f8d51378a2f795e19 --- fs_mgr/fs_mgr.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp index 960173a4d..7ce11062f 100644 --- a/fs_mgr/fs_mgr.cpp +++ b/fs_mgr/fs_mgr.cpp @@ -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; }