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

Commit 9922d188 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove persist.sys.fuse == false code paths" am: 3bede4f4 

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

Change-Id: I2571406cbf43c65a62b6ebd5b4e741650b0a05ca
parents e41d14f2 3bede4f4

rootdir/init.rc

+4 −16
Original line number Diff line number Diff line
@@ -464,6 +464,10 @@ on post-fs 
    # 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/user/0 /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

    restorecon --recursive --cross-filesystems /sys/kernel/debug
@@ -809,22 +813,6 @@ on post-fs-data 
    # Enable FUSE by default

    setprop persist.sys.fuse true



# 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