diff options
author | Tianjie Xu <xunchang@google.com> | 2016-03-08 00:47:14 +0100 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-03-08 00:47:14 +0100 |
commit | 94dc34148c117fd3cfb442a348a69dbbb676a5c5 (patch) | |
tree | c382122e7824b324082f03b5177e2997a7e29893 /install.cpp | |
parent | Merge "recovery: Handle devices without /cache partition." (diff) | |
parent | Reboot and retry on I/O errors (diff) | |
download | android_bootable_recovery-94dc34148c117fd3cfb442a348a69dbbb676a5c5.tar android_bootable_recovery-94dc34148c117fd3cfb442a348a69dbbb676a5c5.tar.gz android_bootable_recovery-94dc34148c117fd3cfb442a348a69dbbb676a5c5.tar.bz2 android_bootable_recovery-94dc34148c117fd3cfb442a348a69dbbb676a5c5.tar.lz android_bootable_recovery-94dc34148c117fd3cfb442a348a69dbbb676a5c5.tar.xz android_bootable_recovery-94dc34148c117fd3cfb442a348a69dbbb676a5c5.tar.zst android_bootable_recovery-94dc34148c117fd3cfb442a348a69dbbb676a5c5.zip |
Diffstat (limited to 'install.cpp')
-rw-r--r-- | install.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/install.cpp b/install.cpp index 33c1f5498..144a353d6 100644 --- a/install.cpp +++ b/install.cpp @@ -144,6 +144,7 @@ try_update_binary(const char* path, ZipArchive* zip, bool* wipe_cache) { close(pipefd[1]); *wipe_cache = false; + bool retry_update = false; char buffer[1024]; FILE* from_child = fdopen(pipefd[0], "r"); @@ -180,6 +181,8 @@ try_update_binary(const char* path, ZipArchive* zip, bool* wipe_cache) { // to be able to reboot during installation (useful for // debugging packages that don't exit). ui->SetEnableReboot(true); + } else if (strcmp(command, "retry_update") == 0) { + retry_update = true; } else { LOGE("unknown command [%s]\n", command); } @@ -188,6 +191,9 @@ try_update_binary(const char* path, ZipArchive* zip, bool* wipe_cache) { int status; waitpid(pid, &status, 0); + if (retry_update) { + return INSTALL_RETRY; + } if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) { LOGE("Error in %s\n(Status %d)\n", path, WEXITSTATUS(status)); return INSTALL_ERROR; |