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

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

Merge "Prepare /data/property before load_persist_props" am: 77cff055 am:... 

Merge "Prepare /data/property before load_persist_props" am: 77cff055 am: 1315ce39 am: 325e869e am: 37124623 am: 9a7f412d

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



Change-Id: Ic8d505640c8bf79dc3147278d02d6e190f932981
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0e4f3088 9a7f412d

rootdir/init.rc

+4 −1
Original line number Diff line number Diff line
@@ -723,9 +723,13 @@ on post-fs-data 
    # Multi-installed APEXes are selected using persist props.

    # Load persist properties and override properties (if enabled) from /data,

    # before starting apexd.

    # /data/property should be created before `load_persist_props`

    mkdir /data/property 0700 root root encryption=Require

    load_persist_props



    start logd

    start logd-reinit



    # Some existing vendor rc files use 'on load_persist_props_action' to know

    # when persist props are ready. These are difficult to change due to GRF,

    # so continue triggering this action here even though props are already loaded
@@ -852,7 +856,6 @@ on post-fs-data 
    mkdir /data/app-asec 0700 root root encryption=Require

    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



    # create directory for updated font files.

    mkdir /data/fonts/ 0771 root root encryption=Require