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: Add "--slot other"" am: 6bb8f752ec 

am: abf108f6b2

* commit 'abf108f6b2cbcc4aaf7cea9719aff8b569245d60':
  fastboot: Add "--slot other"
This commit is contained in:
Daniel Rosenberg 2016-01-06 20:56:13 +00:00 committed by android-build-merger
parent ed60d0706e abf108f6b2
commit ba3e38f9e1
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
fastboot/fastboot.cpp
View File

@ -320,9 +320,10 @@ static void usage() {
" device supports slots. This will be\n"
" added to all partition names that use\n"
" slots. 'all' can be given to refer\n"
" to all slots. If this is not given,\n"
" slotted partitions will default to\n"
" the current active slot.\n"
" to all slots. 'other' can be given to\n"
" refer to a non-current slot. If this\n"
" flag is not used, slotted partitions\n"
" will default to the current active slot.\n"
" -a, --set-active[=<suffix>] Sets the active slot. If no suffix is\n"
" provided, this will default to the value\n"
" given by --slot. If slots are not\n"
@ -797,12 +798,28 @@ static std::string verify_slot(Transport* transport, const char *slot, bool allo
if (!suffixes.empty()) {
return suffixes[0];
} else {
fprintf(stderr, "No known slots.\n");
exit(1);
die("No known slots.");
}
}
}
std::vector<std::string> suffixes = get_suffixes(transport);
if (strcmp(slot, "other") == 0) {
std::string current_slot;
if (!fb_getvar(transport, "current-slot", &current_slot)) {
die("Failed to identify current slot.");
}
if (!suffixes.empty()) {
for (size_t i = 0; i < suffixes.size(); i++) {
if (current_slot == suffixes[i])
return suffixes[(i+1)%suffixes.size()];
}
} else {
die("No known slots.");
}
}
for (const std::string &suffix : suffixes) {
if (suffix == slot)
return slot;