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

Commit 7b4f8519 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by android-build-merger
Browse files

Merge "Revert "Create new mount directory /mnt/runtime/full."" am: 3daecf59 

am: 9ced0aae

Change-Id: Ic9bcc1c5e09cb5c77a668f7399db5db0ba5d7062
parents 0d4a9fee 9ced0aae

rootdir/init.rc

+0 −2
Original line number Diff line number Diff line
@@ -117,8 +117,6 @@ on init 
    mkdir /mnt/runtime/read/self 0755 root root

    mkdir /mnt/runtime/write 0755 root root

    mkdir /mnt/runtime/write/self 0755 root root

    mkdir /mnt/runtime/full 0755 root root

    mkdir /mnt/runtime/full/self 0755 root root



    # Symlink to keep legacy apps working in multi-user world

    symlink /storage/self/primary /sdcard

sdcard/sdcard.cpp

+2 −9
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ static void run_sdcardfs(const std::string& source_path, const std::string& labe 
    std::string dest_path_default = "/mnt/runtime/default/" + label;

    std::string dest_path_read = "/mnt/runtime/read/" + label;

    std::string dest_path_write = "/mnt/runtime/write/" + label;

    std::string dest_path_full = "/mnt/runtime/full/" + label;



    umask(0);

    if (multi_user) {
@@ -173,10 +172,7 @@ static void run_sdcardfs(const std::string& source_path, const std::string& labe 
                                      default_normal, use_esdfs) ||

            !sdcardfs_setup_secondary(dest_path_default, source_path, dest_path_write, uid, gid,

                                      multi_user, userid, AID_EVERYBODY, full_write ? 0007 : 0027,

                                      derive_gid, default_normal, use_esdfs) ||

            !sdcardfs_setup_secondary(dest_path_default, source_path, dest_path_full, uid, gid,

                                      multi_user, userid, AID_EVERYBODY, 0007, derive_gid,

                                      default_normal, use_esdfs)) {

                                      derive_gid, default_normal, use_esdfs)) {

            LOG(FATAL) << "failed to sdcardfs_setup";

        }

    } else {
@@ -190,10 +186,7 @@ static void run_sdcardfs(const std::string& source_path, const std::string& labe 
                                      derive_gid, default_normal, use_esdfs) ||

            !sdcardfs_setup_secondary(dest_path_default, source_path, dest_path_write, uid, gid,

                                      multi_user, userid, AID_EVERYBODY, full_write ? 0007 : 0022,

                                      derive_gid, default_normal, use_esdfs) ||

            !sdcardfs_setup_secondary(dest_path_default, source_path, dest_path_full, uid, gid,

                                      multi_user, userid, AID_EVERYBODY, 0007, derive_gid,

                                      default_normal, use_esdfs)) {

                                      derive_gid, default_normal, use_esdfs)) {

            LOG(FATAL) << "failed to sdcardfs_setup";

        }

    }