tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

Change-Id: I0502399506235078a7d99e1adcb9a1da29cdaf74
This commit is contained in:
David Anderson 2022-03-10 05:35:07 +00:00 committed by Automerger Merge Worker
commit f40562b065
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs_mgr/fs_mgr.cpp
View file

@ -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;
}