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

write_bootloader_message(<options>) should not reset stage field.

Browse source 
Commit bd56f1590c switches to calling
write_bootloader_message(<options>) in get_args(), which
unintentionally resets the stage field thus breaks two-step OTAs.

This CL changes write_bootloader_message(<options>) to only set the
command field (to "boot-recovery") and the recovery field (with the
specified options).

Test: Apply a two-step package.
Change-Id: I6905918812c7d3402cc1524688079066a4d22d29
This commit is contained in:
Tao Bao 2016-12-02 15:33:37 -08:00
parent 3aadbbac39
commit 7e31f421a5
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bootloader_message/bootloader_message.cpp
View file

@ -164,7 +164,13 @@ bool clear_bootloader_message(std::string* err) {
}
bool write_bootloader_message(const std::vector<std::string>& options, std::string* err) {
bootloader_message boot = {};
bootloader_message boot;
if (!read_bootloader_message(&boot, err)) {
return false;
}
// Zero out the entire fields.
memset(boot.command, 0, sizeof(boot.command));
memset(boot.recovery, 0, sizeof(boot.recovery));
strlcpy(boot.command, "boot-recovery", sizeof(boot.command));
strlcpy(boot.recovery, "recovery\n", sizeof(boot.recovery));
for (const auto& s : options) {

3
bootloader_message/include/bootloader_message/bootloader_message.h
View file

@ -192,7 +192,8 @@ bool write_bootloader_message(const bootloader_message& boot, std::string* err);
bool write_bootloader_message_to(const bootloader_message& boot,
const std::string& misc_blk_device, std::string* err);
// Write bootloader message (boots into recovery with the options) to BCB.
// Write bootloader message (boots into recovery with the options) to BCB. Will
// set command and recovery fields only.
bool write_bootloader_message(const std::vector<std::string>& options, std::string* err);
// Clear BCB.