diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-10-02 01:30:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-02 01:30:07 +0000 |
| commit | 8819b90d326586c56361f4ad5b46e97a55b51ea5 (patch) | |
| tree | f533f8254df9225e36280523a8fd324fb75952b8 | |
| parent | c950673062d6102e62d54c7321245e5e8de304bc (diff) | |
| parent | 77dfd99bebf1cb27543f4233c2945701f059b0a4 (diff) | |
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
| -rw-r--r-- | debuggerd/tombstoned/tombstoned.rc | 3 | ||||
| -rw-r--r-- | 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 |