ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Have /storage always point to sdcardfs by default."

Browse source 
am: a587d69364

Change-Id: I730e04651fce8267176b577622bfe0b821ebd8c9
This commit is contained in:
Martijn Coenen 2019-12-14 02:02:53 -08:00 • committed by android-build-merger
commit 74b049c172
1 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
rootdir/init.rc
View file

@ -421,6 +421,9 @@ on post-fs
# Once everything is setup, no need to modify /. # Once everything is setup, no need to modify /.
# The bind+remount combination allows this to work in containers. # The bind+remount combination allows this to work in containers.
mount rootfs rootfs / remount bind ro nodev mount rootfs rootfs / remount bind ro nodev
# Mount default storage into root namespace
mount none /mnt/runtime/default /storage bind rec
mount none none /storage slave rec
# Make sure /sys/kernel/debug (if present) is labeled properly # Make sure /sys/kernel/debug (if present) is labeled properly
# Note that tracefs may be mounted under debug, so we need to cross filesystems # Note that tracefs may be mounted under debug, so we need to cross filesystems
@ -718,22 +721,6 @@ on post-fs-data
chown root system /dev/fscklogs/log chown root system /dev/fscklogs/log
chmod 0770 /dev/fscklogs/log chmod 0770 /dev/fscklogs/log
# Switch between sdcardfs and FUSE depending on persist property
# TODO: Move this to ro property before launch because FDE devices
# interact with persistent properties differently during boot
on zygote-start && property:persist.sys.fuse=true
# Mount default storage into root namespace
mount none /mnt/user/0 /storage bind rec
mount none none /storage slave rec
on zygote-start && property:persist.sys.fuse=false
# Mount default storage into root namespace
mount none /mnt/runtime/default /storage bind rec
mount none none /storage slave rec
on zygote-start && property:persist.sys.fuse=""
# Mount default storage into root namespace
mount none /mnt/runtime/default /storage bind rec
mount none none /storage slave rec
# It is recommended to put unnecessary data/ initialization from post-fs-data # It is recommended to put unnecessary data/ initialization from post-fs-data
# to start-zygote in device's init.rc to unblock zygote start. # to start-zygote in device's init.rc to unblock zygote start.
on zygote-start && property:ro.crypto.state=unencrypted on zygote-start && property:ro.crypto.state=unencrypted