commit dd85c74655400347aee5f6bfecd827a311f16ca4
author Treehugger Robot <treehugger-gerrit@google.com> Thu Oct 25 23:06:51 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 25 23:06:51 2018 +0000
tree 4b837cfa1d412116927789c317cf597fbad89cce
parent 602f9a29b0e94a9e09520ba9a98f3cf3c65bdfca
parent 0444a8cbd96c3dbb75399886b13ece5dc3d6ffa9

Merge "fastboot: Check that reboot to userspace succeeded."

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index 5101410..81350fd 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -1312,6 +1312,9 @@
     if (!is_userspace_fastboot()) {
         reboot_to_userspace_fastboot();
     }
+    if (!is_userspace_fastboot()) {
+        die("Failed to boot into userspace; one or more components might be unbootable.");
+    }
     fb->Download("super", fd, get_file_size(fd));
 
     std::string command = "update-super:super";