commit a4ab3e7474e8215fa695d2cfdf8cf4982572ac86
author Mark Salyzyn <salyzyn@google.com> Fri Jun 24 23:31:24 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 24 23:31:24 2016 +0000
tree 7c891a16d17e32bd0a61e17b81033fc1de6b8f90
parent 09fc6bcce8d5cf3a2ef4f9a7e79de8dcc07d3144
parent ced6078b0e03a75d9b78e61ce25609bd2cb97b1d

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

Change-Id: Iacabdb52ae0e4ad3a6c27e952fa9ce572b282904

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 13b9cd7..47e9f62 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -67,6 +67,7 @@
 static std::string suffix;
 
 #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 RECOVERY_DIR "/cache/recovery"
@@ -835,6 +836,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");