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

Commit 91ab0f84 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "fs_mgr: overlayfs stop adding rootcontext= to mount" am: afac3fe0 

am: 068acefc

Change-Id: Ia8d7f4d4174cbc817a0818bf84cc10f8169c5093
parents 81b8b8ab 068acefc

fs_mgr/fs_mgr_overlayfs.cpp

+1 −3
Original line number Diff line number Diff line
@@ -147,10 +147,8 @@ std::string fs_mgr_get_overlayfs_options(const std::string& mount_point) { 
    auto candidate = fs_mgr_get_overlayfs_candidate(mount_point);

    if (candidate.empty()) return "";



    auto context = fs_mgr_get_context(mount_point);

    if (!context.empty()) context = ",rootcontext="s + context;

    return "override_creds=off,"s + kLowerdirOption + mount_point + "," + kUpperdirOption +

           candidate + kUpperName + ",workdir=" + candidate + kWorkName + context;

           candidate + kUpperName + ",workdir=" + candidate + kWorkName;

}



bool fs_mgr_system_root_image(const fstab* fstab) {