openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "fastboot: fix set_active for legacy A/B." 

am: 719263e6d2

Change-Id: I1648745412c4aa8ec64d1ca0865b94f326e93643
This commit is contained in:
David Pursell 2016-12-16 18:12:08 +00:00 committed by android-build-merger
parent a6532b4717 719263e6d2
commit 494737b05a
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fastboot/fastboot.cpp
View File

@ -1742,6 +1742,14 @@ int main(int argc, char **argv)
} else if(!strcmp(*argv, "set_active")) {
require(2);
std::string slot = verify_slot(transport, std::string(argv[1]), false);
// Legacy support: verify_slot() removes leading underscores, we need to put them back
// in for old bootloaders. Legacy bootloaders do not have the slot-count variable but
// do have slot-suffixes.
std::string var;
if (!fb_getvar(transport, "slot-count", &var) &&
fb_getvar(transport, "slot-suffixes", &var)) {
slot = "_" + slot;
}
fb_set_active(slot.c_str());
skip(2);
} else if(!strcmp(*argv, "oem")) {