From 0dbb2a75f25422bbfb624dec554d1df4df64314e Mon Sep 17 00:00:00 2001 From: Martijn Coenen Date: Tue, 17 Dec 2019 13:45:10 +0000 Subject: [PATCH] Revert "Have /storage always point to sdcardfs by default." This reverts commit 5d53bfce2dfc1a48143c69182fea76be81091c37. Reason for revert: for consistency, we've decided that for now, all code will have the same view of /storage: FUSE. Will address the TODO here later. Change-Id: Ia75e23c91fb098f6309c160de2889f06507c3717 --- rootdir/init.rc | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/rootdir/init.rc b/rootdir/init.rc index c2c9df382..b89c45e0d 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -421,9 +421,6 @@ on post-fs # Once everything is setup, no need to modify /. # The bind+remount combination allows this to work in containers. 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 # Note that tracefs may be mounted under debug, so we need to cross filesystems @@ -721,6 +718,22 @@ on post-fs-data chown root system /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 # to start-zygote in device's init.rc to unblock zygote start. on zygote-start && property:ro.crypto.state=unencrypted