From 81c94cdce6baa9847f2f5fda45c885b41cf3fb3b Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Thu, 1 Oct 2020 13:01:15 -0700 Subject: [PATCH] Start tombstoned early in post-fs-data. Bug: http://b/169659307 Test: manual Change-Id: Ie19de31e7e2b6cd43402cfd3a2e9274728e9e6b4 --- debuggerd/tombstoned/tombstoned.rc | 3 --- rootdir/init.rc | 9 ++++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debuggerd/tombstoned/tombstoned.rc b/debuggerd/tombstoned/tombstoned.rc index b4a1e71fb..c39f4e4f2 100644 --- a/debuggerd/tombstoned/tombstoned.rc +++ b/debuggerd/tombstoned/tombstoned.rc @@ -6,6 +6,3 @@ service tombstoned /system/bin/tombstoned socket tombstoned_intercept seqpacket 0666 system system socket tombstoned_java_trace seqpacket 0666 system system writepid /dev/cpuset/system-background/tasks - -on post-fs-data - start tombstoned diff --git a/rootdir/init.rc b/rootdir/init.rc index 91f2c5766..108f00376 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -561,6 +561,12 @@ on post-fs-data # Make sure that apexd is started in the default namespace enter_default_mount_ns + # Start tombstoned early to be able to store tombstones. + mkdir /data/tombstones 0771 system system encryption=Require + mkdir /data/vendor/tombstones 0771 root root + mkdir /data/vendor/tombstones/wifi 0771 wifi wifi + start tombstoned + # /data/apex is now available. Start apexd to scan and activate APEXes. mkdir /data/apex 0755 root system encryption=None mkdir /data/apex/active 0755 root system @@ -661,9 +667,6 @@ on post-fs-data mkdir /data/app-lib 0771 system system encryption=Require mkdir /data/app 0771 system system encryption=Require mkdir /data/property 0700 root root encryption=Require - mkdir /data/tombstones 0771 system system encryption=Require - mkdir /data/vendor/tombstones 0771 root root - mkdir /data/vendor/tombstones/wifi 0771 wifi wifi # Create directories to push tests to for each linker namespace. # Create the subdirectories in case the first test is run as root