commit 2b12e660da969fed27a9060b1d190b7630d2f886
author Josh Gao <jmgao@google.com> Fri Jan 20 22:20:54 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 20 22:20:54 2017 +0000
tree 355043a169de7a96d0e93d98d545cb96b91d3010
parent 7ae49c4dd7ba0517e41f6c7d41a787def52e2634
parent cfc094a09b170d9903b9fb2aa36c7c08d37ee6a5

Merge "init: don't start tombstoned until /data is mounted." am: b479a5002e
am: f83489c02c

Change-Id: I3334af98c1eb7c8b503ecea6700459454533dd44

debuggerd/tombstoned/tombstoned.rc

diff --git a/debuggerd/tombstoned/tombstoned.rc b/debuggerd/tombstoned/tombstoned.rc
index 3aacf33..eaae9c4 100644
--- a/debuggerd/tombstoned/tombstoned.rc
+++ b/debuggerd/tombstoned/tombstoned.rc
@@ -1,6 +1,4 @@
 service tombstoned /system/bin/tombstoned
-    class core
-
     user tombstoned
     group system
 

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 998e064..8d974fa 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -355,14 +355,13 @@
     # We restorecon /data in case the userdata partition has been reset.
     restorecon /data
 
-    # start debuggerd to make debugging early-boot crashes easier.
-    start debuggerd
-    start debuggerd64
-
     # Make sure we have the device encryption key.
     start vold
     installkey /data
 
+    # start tombstoned to record early-boot crashes.
+    start tombstoned
+
     # Start bootcharting as soon as possible after the data partition is
     # mounted to collect more data.
     mkdir /data/bootchart 0755 shell shell