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

Commit 0dbb2a75 authored by Martijn Coenen's avatar Martijn Coenen
Browse files

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

This reverts commit 5d53bfce.

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
parent 5d53bfce

rootdir/init.rc

+16 −3
Original line number Diff line number Diff line
@@ -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