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

Commit 7cb9bf89 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add /mnt/androidwritable for MOUNT_EXTERNAL_ANDROID_WRITABLE apps" into... 

Merge "Add /mnt/androidwritable for MOUNT_EXTERNAL_ANDROID_WRITABLE apps" into rvc-dev am: af9240ab am: 1cd96037

Change-Id: Ibe7cedeaea584c509b2fe85d23cafa41ee3bae70
parents 46848a6a 1cd96037

init/mount_namespace.cpp

+7 −1
Original line number Original line 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

    // 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

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

    // default namespace.

    // 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/user", 0755)) return false;

    if (!mkdir_recursive("/mnt/installer", 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;

    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/installer"))) return false;

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

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

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

    // will be inherited by new mount namespaces.

    // will be inherited by new mount namespaces.

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

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

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





    bootstrap_ns_fd.reset(OpenMountNamespace());

    bootstrap_ns_fd.reset(OpenMountNamespace());

    bootstrap_ns_id = GetMountNamespaceId();

    bootstrap_ns_id = GetMountNamespaceId();