diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2016-04-05 16:35:53 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-05 16:35:53 +0200 |
| commit | 419538869d3e92270f748316f4956eeb431663c3 (patch) | |
| tree | 0b0fd25e6deefb0ecb40c52bde528a4847c0fb0e | |
| parent | Merge "Move selinux dependencies out of header files." (diff) | |
| parent | Merge "recovery-persist: pick up both pstore console files" (diff) | |
| download | android_bootable_recovery-419538869d3e92270f748316f4956eeb431663c3.tar android_bootable_recovery-419538869d3e92270f748316f4956eeb431663c3.tar.gz android_bootable_recovery-419538869d3e92270f748316f4956eeb431663c3.tar.bz2 android_bootable_recovery-419538869d3e92270f748316f4956eeb431663c3.tar.lz android_bootable_recovery-419538869d3e92270f748316f4956eeb431663c3.tar.xz android_bootable_recovery-419538869d3e92270f748316f4956eeb431663c3.tar.zst android_bootable_recovery-419538869d3e92270f748316f4956eeb431663c3.zip | |
| -rw-r--r-- | recovery-persist.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/recovery-persist.cpp b/recovery-persist.cpp index 8587e9a66..25df03f47 100644 --- a/recovery-persist.cpp +++ b/recovery-persist.cpp @@ -50,6 +50,7 @@ static const char *LAST_LOG_FILE = "/data/misc/recovery/last_log"; static const char *LAST_PMSG_FILE = "/sys/fs/pstore/pmsg-ramoops-0"; static const char *LAST_KMSG_FILE = "/data/misc/recovery/last_kmsg"; static const char *LAST_CONSOLE_FILE = "/sys/fs/pstore/console-ramoops-0"; +static const char *ALT_LAST_CONSOLE_FILE = "/sys/fs/pstore/console-ramoops"; static const int KEEP_LOG_COUNT = 10; @@ -192,8 +193,12 @@ int main(int argc, char **argv) { LOG_ID_SYSTEM, ANDROID_LOG_INFO, "recovery/", logsave, NULL); /* Is there a last console log too? */ - if (rotated && !access(LAST_CONSOLE_FILE, R_OK)) { - copy_file(LAST_CONSOLE_FILE, LAST_KMSG_FILE); + if (rotated) { + if (!access(LAST_CONSOLE_FILE, R_OK)) { + copy_file(LAST_CONSOLE_FILE, LAST_KMSG_FILE); + } else if (!access(ALT_LAST_CONSOLE_FILE, R_OK)) { + copy_file(ALT_LAST_CONSOLE_FILE, LAST_KMSG_FILE); + } } return 0; |