Merge "init.rc: restorecon /data/media before chattr" am: 3a728ac7c6

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

Change-Id: Ib600570523bba0702e411e7ac73844b57e9e8a34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2022-05-18 00:16:19 +00:00 committed by Automerger Merge Worker
commit 71fca25a67
1 changed files with 5 additions and 1 deletions

View File

@ -922,7 +922,6 @@ on post-fs-data
# contain any subdirectories other than the per-user ones. /data/media/obb
# is an exception that exists for legacy reasons.
mkdir /data/media 0770 media_rw media_rw encryption=None
exec - media_rw media_rw -- /system/bin/chattr +F /data/media
mkdir /data/misc_ce 01771 system misc encryption=None
mkdir /data/misc_de 01771 system misc encryption=None
mkdir /data/system_ce 0770 system system encryption=None
@ -932,6 +931,11 @@ on post-fs-data
mkdir /data/vendor_ce 0771 root root encryption=None
mkdir /data/vendor_de 0771 root root encryption=None
# Set the casefold flag on /data/media. For upgrades, a restorecon can be
# needed first to relabel the directory from media_rw_data_file.
restorecon /data/media
exec - media_rw media_rw -- /system/bin/chattr +F /data/media
# A tmpfs directory, which will contain all apps CE DE data directory that
# bind mount from the original source.
mount tmpfs tmpfs /data_mirror nodev noexec nosuid mode=0700,uid=0,gid=1000