summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot2017-01-20 16:13:38 -0600
committerGerrit Code Review2017-01-20 16:13:38 -0600
commitb479a5002e99e7454ed07d7b4631704d4c611193 (patch)
treeb79321ee812841ee3ec3a50c62dc73d79a2a2fd9
parentb5e530f720179f9a57122fa0ba8f502c2b2918db (diff)
parent42a0fed78b761ab06f220786c29f51459265bdec (diff)
downloadplatform-system-core-b479a5002e99e7454ed07d7b4631704d4c611193.tar.gz
platform-system-core-b479a5002e99e7454ed07d7b4631704d4c611193.tar.xz
platform-system-core-b479a5002e99e7454ed07d7b4631704d4c611193.zip
Merge "init: don't start tombstoned until /data is mounted."
-rw-r--r--debuggerd/tombstoned/tombstoned.rc2
-rw-r--r--rootdir/init.rc7
2 files changed, 3 insertions, 6 deletions
diff --git a/debuggerd/tombstoned/tombstoned.rc b/debuggerd/tombstoned/tombstoned.rc
index 3aacf332f..eaae9c475 100644
--- a/debuggerd/tombstoned/tombstoned.rc
+++ b/debuggerd/tombstoned/tombstoned.rc
@@ -1,6 +1,4 @@
1service tombstoned /system/bin/tombstoned 1service tombstoned /system/bin/tombstoned
2 class core
3
4 user tombstoned 2 user tombstoned
5 group system 3 group system
6 4
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 998e064b4..8d974fa12 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -355,14 +355,13 @@ on post-fs-data
355 # We restorecon /data in case the userdata partition has been reset. 355 # We restorecon /data in case the userdata partition has been reset.
356 restorecon /data 356 restorecon /data
357 357
358 # start debuggerd to make debugging early-boot crashes easier.
359 start debuggerd
360 start debuggerd64
361
362 # Make sure we have the device encryption key. 358 # Make sure we have the device encryption key.
363 start vold 359 start vold
364 installkey /data 360 installkey /data
365 361
362 # start tombstoned to record early-boot crashes.
363 start tombstoned
364
366 # Start bootcharting as soon as possible after the data partition is 365 # Start bootcharting as soon as possible after the data partition is
367 # mounted to collect more data. 366 # mounted to collect more data.
368 mkdir /data/bootchart 0755 shell shell 367 mkdir /data/bootchart 0755 shell shell