Merge "Start tombstoned early in post-fs-data." am: 77dfd99beb

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1445776

Change-Id: I8804b3b51898c334a4c5d40db8e360d384b6710b
This commit is contained in:
Treehugger Robot 2020-10-02 01:30:07 +00:00 committed by Automerger Merge Worker
commit 8819b90d32
2 changed files with 6 additions and 6 deletions

View file

@ -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

View file

@ -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