diff options
| author | Tom Cherry <tomcherry@google.com> | 2017-09-21 18:37:22 +0000 |
|---|---|---|
| committer | Tom Cherry <tomcherry@google.com> | 2017-09-21 18:37:22 +0000 |
| commit | c5f5fd430ad08d0a62e08affbcf827a06e17e213 (patch) | |
| tree | 41cc1d39eda3540e3247a153b6222cdb04491c2f /fs_mgr | |
| parent | f4ec2c50a3d2fec6d2d95f9259d9c44900977748 (diff) | |
| download | system_core-c5f5fd430ad08d0a62e08affbcf827a06e17e213.tar.gz system_core-c5f5fd430ad08d0a62e08affbcf827a06e17e213.tar.bz2 system_core-c5f5fd430ad08d0a62e08affbcf827a06e17e213.zip | |
Revert "Remove comments and code about ro.boot.slot"
This reverts commit f4ec2c50a3d2fec6d2d95f9259d9c44900977748.
Dependencies hadn't been merged yet.
Bug: 66437505
Change-Id: I7551b7f2f184a6fefc39e184a42dc8d323c58b89
Diffstat (limited to 'fs_mgr')
| -rw-r--r-- | fs_mgr/fs_mgr_slotselect.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/fs_mgr/fs_mgr_slotselect.cpp b/fs_mgr/fs_mgr_slotselect.cpp index 33fd56240..9ca15e237 100644 --- a/fs_mgr/fs_mgr_slotselect.cpp +++ b/fs_mgr/fs_mgr_slotselect.cpp @@ -21,12 +21,19 @@ #include "fs_mgr.h" #include "fs_mgr_priv.h" -// Returns "_a" or "_b" based on androidboot.slot_suffix in kernel cmdline, or an empty string -// if that parameter does not exist. +// Returns "_a" or "_b" based on two possible values in kernel cmdline: +// - androidboot.slot = a or b OR +// - androidboot.slot_suffix = _a or _b +// TODO: remove slot_suffix once it's deprecated. std::string fs_mgr_get_slot_suffix() { + std::string slot; std::string ab_suffix; - fs_mgr_get_boot_config("slot_suffix", &ab_suffix); + if (fs_mgr_get_boot_config("slot", &slot)) { + ab_suffix = "_" + slot; + } else if (!fs_mgr_get_boot_config("slot_suffix", &ab_suffix)) { + ab_suffix = ""; + } return ab_suffix; } |