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

Commit 848c5ea2 authored by satayev's avatar satayev Committed by Automerger Merge Worker
Browse files

Merge "Attempt to fix labels on /data/system/environ/." am: 39a15111 am:... 

Merge "Attempt to fix labels on /data/system/environ/." am: 39a15111 am: 838c52c2 am: e51b9623 am: 27fa2279

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

Change-Id: Idf5f91ba48afe5d16debff3b78771697059fe489
parents 30629472 27fa2279

rootdir/init.rc

+3 −1
Original line number Diff line number Diff line
@@ -821,6 +821,9 @@ on post-fs-data 
    mkdir /data/ss 0700 system system encryption=Require



    mkdir /data/system 0775 system system encryption=Require

    mkdir /data/system/environ 0700 system system

    # b/183861600 attempt to fix selinux label before running derive_classpath service

    restorecon /data/system/environ

    mkdir /data/system/dropbox 0700 system system

    mkdir /data/system/heapdump 0700 system system

    mkdir /data/system/users 0775 system system
@@ -885,7 +888,6 @@ on post-fs-data 
    perform_apex_config



    # Define and export *CLASSPATH variables

    mkdir /data/system/environ 0700 system system

    # Must start before 'odsign', as odsign depends on *CLASSPATH variables

    exec_start derive_classpath

    load_exports /data/system/environ/classpath