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

Commit 6030f2f0 authored by Martijn Coenen's avatar Martijn Coenen Committed by Android (Google) Code Review
Browse files

Merge changes from topic "fusectl" into rvc-dev 

* changes:
  Abort FUSE filesystems during shutdown.
  Abort FUSE filesystem when Zygote restarts.
  Mount fusectl filesystem.
parents bff51b88 860ba643

init/reboot.cpp

+4 −1
Original line number Diff line number Diff line
@@ -678,9 +678,12 @@ static void DoReboot(unsigned int cmd, const std::string& reason, const std::str 
    // Reap subcontext pids.

    ReapAnyOutstandingChildren();



    // 3. send volume shutdown to vold

    // 3. send volume abort_fuse and volume shutdown to vold

    Service* vold_service = ServiceList::GetInstance().FindService("vold");

    if (vold_service != nullptr && vold_service->IsRunning()) {

        // Manually abort FUSE connections, since the FUSE daemon is already dead

        // at this point, and unmounting it might hang.

        CallVdc("volume", "abort_fuse");

        CallVdc("volume", "shutdown");

        vold_service->Stop();

    } else {

rootdir/init.rc

+3 −0
Original line number Diff line number Diff line
@@ -177,6 +177,9 @@ on init 
    mount binder binder /dev/binderfs stats=global

    chmod 0755 /dev/binderfs



    # Mount fusectl

    mount fusectl none /sys/fs/fuse/connections



    symlink /dev/binderfs/binder /dev/binder

    symlink /dev/binderfs/hwbinder /dev/hwbinder

    symlink /dev/binderfs/vndbinder /dev/vndbinder

rootdir/init.zygote32.rc

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ service zygote /system/bin/app_process -Xzygote /system/bin --zygote --start-sys 
    group root readproc reserved_disk

    socket zygote stream 660 root system

    socket usap_pool_primary stream 660 root system

    onrestart exec_background - system system -- /system/bin/vdc volume abort_fuse

    onrestart write /sys/power/state on

    onrestart restart audioserver

    onrestart restart cameraserver

rootdir/init.zygote32_64.rc

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ service zygote /system/bin/app_process32 -Xzygote /system/bin --zygote --start-s 
    group root readproc reserved_disk

    socket zygote stream 660 root system

    socket usap_pool_primary stream 660 root system

    onrestart exec_background - system system -- /system/bin/vdc volume abort_fuse

    onrestart write /sys/power/state on

    onrestart restart audioserver

    onrestart restart cameraserver

rootdir/init.zygote64.rc

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ service zygote /system/bin/app_process64 -Xzygote /system/bin --zygote --start-s 
    group root readproc reserved_disk

    socket zygote stream 660 root system

    socket usap_pool_primary stream 660 root system

    onrestart exec_background - system system -- /system/bin/vdc volume abort_fuse

    onrestart write /sys/power/state on

    onrestart restart audioserver

    onrestart restart cameraserver