diff options
| -rw-r--r-- | crash_reporter/crash_reporter.cc | 3 | ||||
| -rw-r--r-- | crash_reporter/crash_reporter.rc | 4 | ||||
| -rw-r--r-- | crash_reporter/kernel_collector.cc | 4 | ||||
| -rw-r--r-- | metricsd/metrics_collector.cc | 3 |
4 files changed, 10 insertions, 4 deletions
diff --git a/crash_reporter/crash_reporter.cc b/crash_reporter/crash_reporter.cc index b69492a0c..16e70d8a8 100644 --- a/crash_reporter/crash_reporter.cc +++ b/crash_reporter/crash_reporter.cc @@ -43,7 +43,8 @@ #endif static const char kCrashCounterHistogram[] = "Logging.CrashCounter"; -static const char kKernelCrashDetected[] = "/var/run/kernel-crash-detected"; +static const char kKernelCrashDetected[] = + "/data/misc/crash_reporter/run/kernel-crash-detected"; static const char kUncleanShutdownDetected[] = "/var/run/unclean-shutdown-detected"; static const char kGUIDFileName[] = "/data/misc/crash_reporter/guid"; diff --git a/crash_reporter/crash_reporter.rc b/crash_reporter/crash_reporter.rc index 57c1d40ad..e6d1ec527 100644 --- a/crash_reporter/crash_reporter.rc +++ b/crash_reporter/crash_reporter.rc @@ -13,6 +13,10 @@ on post-fs-data # Remove any previous orphaned locks. rmdir /data/misc/crash_reporter/lock/crash_sender + # Remove any previous run files. + rm /data/misc/crash_reporter/run/kernel-crash-detected + rmdir /data/misc/crash_reporter/run + # Create crash directories. # These directories are group-writable by root so that crash_reporter can # still access them when it switches users. diff --git a/crash_reporter/kernel_collector.cc b/crash_reporter/kernel_collector.cc index cb3a31504..68f2d9e8a 100644 --- a/crash_reporter/kernel_collector.cc +++ b/crash_reporter/kernel_collector.cc @@ -30,8 +30,8 @@ using base::StringPrintf; namespace { const char kDefaultKernelStackSignature[] = "kernel-UnspecifiedStackSignature"; -const char kDumpParentPath[] = "/dev"; -const char kDumpPath[] = "/dev/pstore"; +const char kDumpParentPath[] = "/sys/fs"; +const char kDumpPath[] = "/sys/fs/pstore"; const char kDumpFormat[] = "dmesg-ramoops-%zu"; const char kKernelExecName[] = "kernel"; // Maximum number of records to examine in the kDumpPath. diff --git a/metricsd/metrics_collector.cc b/metricsd/metrics_collector.cc index c3f42dcbf..45ae0a439 100644 --- a/metricsd/metrics_collector.cc +++ b/metricsd/metrics_collector.cc @@ -59,7 +59,8 @@ const int kSecondsPerWeek = kSecondsPerDay * kDaysPerWeek; // Interval between calls to UpdateStats(). const uint32_t kUpdateStatsIntervalMs = 300000; -const char kKernelCrashDetectedFile[] = "/var/run/kernel-crash-detected"; +const char kKernelCrashDetectedFile[] = + "/data/misc/crash_reporter/run/kernel-crash-detected"; const char kUncleanShutdownDetectedFile[] = "/var/run/unclean-shutdown-detected"; |