commit 441e6b91e1b24f37d83713788aa9c17fd882f6f5
author Artur Satayev <satayev@google.com> Tue Mar 30 11:49:05 2021 +0100
committer Artur Satayev <satayev@google.com> Tue Mar 30 11:49:05 2021 +0100
tree 4f4b0214dccbd6d97aaa7b8fcb32ea9d52620243
parent 0b99f553ae63983779522d380a2bec39f1b97412

Attempt to fix labels on /data/system/environ/.

Bug: 183861600
Bug: 180105615
Test: presubmit && cuttlefish boots
Change-Id: Ic5206eb28e8028ec3c9c4b5a756c46ddb6e68b58

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index a04ae9f..a87efb3 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -821,6 +821,9 @@
     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 @@
     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