commit 7d0a762ecaf9f4d005f0f6db913034c2e084d362
author Mark Salyzyn <salyzyn@google.com> Fri Jun 24 14:06:15 2016 -0700
committer Mark Salyzyn <salyzyn@google.com> Fri Jun 24 14:14:10 2016 -0700
tree 77eeef318e81a799b2a0eea08c8cc1818dc9268c
parent c1c06a7d6b72e60969c1ae7f02415b1fb9770fff

dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG

Bug: 29639467
Change-Id: Iba0b1754eaebfb2b0624dcbef522b7d8456eeb50

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 5b7fda3..afb1255 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -46,6 +46,7 @@
 static char screenshot_path[PATH_MAX] = "";
 
 #define PSTORE_LAST_KMSG "/sys/fs/pstore/console-ramoops"
+#define ALT_PSTORE_LAST_KMSG "/sys/fs/pstore/console-ramoops-0"
 
 #define RAFT_DIR "/data/misc/raft/"
 #define TOMBSTONE_DIR "/data/tombstones"
@@ -540,6 +541,8 @@
     if (!stat(PSTORE_LAST_KMSG, &st)) {
         /* Also TODO: Make console-ramoops CAP_SYSLOG protected. */
         dump_file("LAST KMSG", PSTORE_LAST_KMSG);
+    } else if (!stat(ALT_PSTORE_LAST_KMSG, &st)) {
+        dump_file("LAST KMSG", ALT_PSTORE_LAST_KMSG);
     } else {
         /* TODO: Make last_kmsg CAP_SYSLOG protected. b/5555691 */
         dump_file("LAST KMSG", "/proc/last_kmsg");