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

Commit a4c163d7 authored by Ricky Wai's avatar Ricky Wai
Browse files

Add /mnt/androidwritable for MOUNT_EXTERNAL_ANDROID_WRITABLE apps 

Bug: 153540919
Test: Able to boot without errors
Change-Id: If206e5e3d76a7919b7468bc2d9666b3aff296b3b
Merged-In: If206e5e3d76a7919b7468bc2d9666b3aff296b3b
parent 126b010f

init/mount_namespace.cpp

+7 −1
Original line number Diff line number Diff line
@@ -240,14 +240,20 @@ bool SetupMountNamespaces() { 
    // slave to the /mnt/user mount, and at the same time /mnt/installer in the

    // bootstrap namespace shares a peer group with /mnt/installer in the

    // default namespace.

    // /mnt/androidwritable is similar to /mnt/installer but serves for

    // MOUNT_EXTERNAL_ANDROID_WRITABLE apps.

    if (!mkdir_recursive("/mnt/user", 0755)) return false;

    if (!mkdir_recursive("/mnt/installer", 0755)) return false;

    if (!mkdir_recursive("/mnt/androidwritable", 0755)) return false;

    if (!(BindMount("/mnt/user", "/mnt/installer", true))) return false;

    // First, make /mnt/installer a slave bind mount

    if (!(BindMount("/mnt/user", "/mnt/androidwritable", true))) return false;

    // First, make /mnt/installer and /mnt/androidwritable a slave bind mount

    if (!(MakeSlave("/mnt/installer"))) return false;

    if (!(MakeSlave("/mnt/androidwritable"))) return false;

    // Then, make it shared again - effectively creating a new peer group, that

    // will be inherited by new mount namespaces.

    if (!(MakeShared("/mnt/installer"))) return false;

    if (!(MakeShared("/mnt/androidwritable"))) return false;



    bootstrap_ns_fd.reset(OpenMountNamespace());

    bootstrap_ns_id = GetMountNamespaceId();