Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d53bfce authored by Martijn Coenen's avatar Martijn Coenen
Browse files

Have /storage always point to sdcardfs by default. 

This is a partial revert of change
Idf851b3a42910e0ce8fdd75daea1cce91dd1aa98, and brings us back to the
state we shipped in Q.

The default behavior for now is that we want native daemons to use the
default sdcardfs view, as they did before. Zygote-spawned apps will then
get the correct view assigned to them as they get spawned.

Bug: 146189163
Test: atest AdoptableHostTest
Change-Id: I2248f39e029138962a41a6ead944431414c901ad
parent a5a6c0a0

rootdir/init.rc

+3 −16
Original line number Diff line number Diff line
@@ -421,6 +421,9 @@ 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
@@ -718,22 +721,6 @@ 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