commit af1cc8c3278966ffece3521a5a15ef6f76304e9d
author Mark Salyzyn <salyzyn@google.com> Tue Apr 05 14:41:31 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 05 14:41:31 2016 +0000
tree f1cb4b7d364ff875cd3cb8be3cbed57a8bd14931
parent dcc29b8ff5897c6bd094e643c404835aedf97ce0
parent 59a55b57bc8543ad0d080f117fc9ae53b1d95e1b

Merge "recovery-persist: pick up both pstore console files" am: 901f315 am: 4195388
am: 59a55b5

* commit '59a55b57bc8543ad0d080f117fc9ae53b1d95e1b':
  recovery-persist: pick up both pstore console files

Change-Id: I94e04f486fed0bc79827a1805989424265afa28b

recovery-persist.cpp

diff --git a/recovery-persist.cpp b/recovery-persist.cpp
index 8587e9a..25df03f 100644
--- a/recovery-persist.cpp
+++ b/recovery-persist.cpp
@@ -50,6 +50,7 @@
 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 @@
         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;