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

Merge "recovery: Add "boot-fastboot" command to BCB."

Browse source
This commit is contained in:
Treehugger Robot 2018-08-22 01:48:58 +00:00 committed by Gerrit Code Review
commit 0115b79cbd
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
recovery_main.cpp
View file

@ -97,8 +97,13 @@ static std::vector<std::string> get_args(const int argc, char** const argv) {
} }
stage = std::string(boot.stage); stage = std::string(boot.stage);
std::string boot_command;
if (boot.command[0] != 0) { if (boot.command[0] != 0) {
std::string boot_command = std::string(boot.command, sizeof(boot.command)); if (memchr(boot.command, '\0', sizeof(boot.command))) {
boot_command = std::string(boot.command);
} else {
boot_command = std::string(boot.command, sizeof(boot.command));
}
LOG(INFO) << "Boot command: " << boot_command; LOG(INFO) << "Boot command: " << boot_command;
} }
@ -149,6 +154,12 @@ static std::vector<std::string> get_args(const int argc, char** const argv) {
LOG(ERROR) << "Failed to set BCB message: " << err; LOG(ERROR) << "Failed to set BCB message: " << err;
} }
// Finally, if no arguments were specified, check whether we should boot
// into fastboot.
if (args.size() == 1 && boot_command == "boot-fastboot") {
args.emplace_back("--fastboot");
}
return args; return args;
} }