Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f020607b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "init.rc: start tombstoned before switching mount namespace" am: 8a573b4d am: f1f50dc6 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba6ae45378bcbef182ba87d190587e0e81b60995
parents 2c521ef8 f1f50dc6

rootdir/init.rc

+4 −5
Original line number Diff line number Diff line
@@ -635,20 +635,21 @@ on post-fs-data 
    mkdir /data/bootchart 0755 shell shell encryption=Require

    bootchart start



    # Make sure that apexd is started in the default namespace

    enter_default_mount_ns



    mkdir /data/vendor 0771 root root encryption=Require

    mkdir /data/vendor_ce 0771 root root encryption=None

    mkdir /data/vendor_de 0771 root root encryption=None

    mkdir /data/vendor/hardware 0771 root root



    # Start tombstoned early to be able to store tombstones.

    mkdir /data/anr 0775 system system 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

    start tombstoned



    # Make sure that apexd is started in the default namespace

    enter_default_mount_ns



    # /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
@@ -781,8 +782,6 @@ on post-fs-data 
    # the following directory.

    mkdir /data/mediadrm 0770 mediadrm mediadrm encryption=Require



    mkdir /data/anr 0775 system system encryption=Require



    # NFC: create data/nfc for nv storage

    mkdir /data/nfc 0770 nfc nfc encryption=Require

    mkdir /data/nfc/param 0770 nfc nfc