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

Commit a5675208 authored by Yi-yo Chiang's avatar Yi-yo Chiang Committed by Automerger Merge Worker
Browse files

Merge "fs_mgr_overlayfs: Try "/system" and "/" when setting "/system" shared... 

Merge "fs_mgr_overlayfs: Try "/system" and "/" when setting "/system" shared type" am: 44f1f094 am: c57557ba am: b31d1e05 am: f26b137e am: a9efcc84

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



Change-Id: Idcbaba3c97e9496ff59e087b30ccbe16e985f6fe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3c0d2661 a9efcc84

fs_mgr/fs_mgr_overlayfs.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -642,6 +642,10 @@ bool fs_mgr_overlayfs_set_shared_mount(const std::string& mount_point, bool shar 
    if (ret) {

    if (ret) {

        PERROR << "__mount(target=" << mount_point

        PERROR << "__mount(target=" << mount_point

               << ",flag=" << (shared_flag ? "MS_SHARED" : "MS_PRIVATE") << ")=" << ret;

               << ",flag=" << (shared_flag ? "MS_SHARED" : "MS_PRIVATE") << ")=" << ret;

        // If "/system" doesn't look like a mountpoint, retry with "/".

        if (errno == EINVAL && mount_point == "/system") {

            return fs_mgr_overlayfs_set_shared_mount("/", shared_flag);

        }

        return false;

        return false;

    }

    }

    return true;

    return true;