commit cc34e0c6b06bbffdf47e0380276a65be334b0234
author Daniel Rosenberg <drosen@google.com> Tue Feb 04 23:03:38 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 04 23:03:38 2020 +0000
tree 6953544cd112166293534f960eb0e8e0ddc72612
parent 8017a68b1d6fa5ff71fa1d47eba2bd1727fcb274
parent 36b905bcaf20c36ff960cd27fb235ab7cffa8f87

Merge "Make /data/media case insensitive"

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index c6fcafa..5fbad75 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -694,10 +694,6 @@
     mkdir /data/user/0 0700 system system encryption=None
     mount none /data/data /data/user/0 bind rec
 
-    # Special-case /data/media/obb per b/64566063
-    mkdir /data/media 0770 media_rw media_rw encryption=None
-    mkdir /data/media/obb 0770 media_rw media_rw encryption=Attempt
-
     # A tmpfs directory, which will contain all apps CE DE data directory that
     # bind mount from the original source.
     chown root root /data_mirror
@@ -735,6 +731,11 @@
     wait_for_prop apexd.status ready
     perform_apex_config
 
+    # Special-case /data/media/obb per b/64566063
+    mkdir /data/media 0770 media_rw media_rw encryption=None
+    exec - media_rw media_rw -- /system/bin/chattr +F /data/media
+    mkdir /data/media/obb 0770 media_rw media_rw encryption=Attempt
+
     exec_start derive_sdk
 
     init_user0