commit 4f93d3cebad24e779017ed3a78b18105fdaa4896
author Vineela Tummalapalli <vineela.tummalapalli@intel.com> Thu Nov 10 02:52:23 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 10 02:52:23 2016 +0000
tree 055ea591a6461264f248cf08b03bf7baee407177
parent 18f2061bae28a43342380500504901e71922ae19
parent 8943b48a95b5324c651080e522b248a9a67eb810

Merge "Implement Reboot bootloader via bootloader_message"
am: e759c83bde

Change-Id: Id0a0e9e9c10f3df206138f297d2acafa87dc4ebf

init/builtins.cpp

diff --git a/init/builtins.cpp b/init/builtins.cpp
index 0206644..9d1bb80 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -708,6 +708,15 @@
             callback_on_ro_remount = unmount_and_fsck;
         } else if (cmd == ANDROID_RB_RESTART2) {
             reboot_target = &command[len + 1];
+            // When rebooting to the bootloader notify the bootloader writing
+            // also the BCB.
+            if (strcmp(reboot_target, "bootloader") == 0) {
+                std::string err;
+                if (!write_reboot_bootloader(&err)) {
+                    LOG(ERROR) << "reboot-bootloader: Error writing "
+                                  "bootloader_message: " << err;
+                }
+            }
         }
     } else if (command[len] != '\0') {
         LOG(ERROR) << "powerctl: unrecognized reboot target '" << &command[len] << "'";