commit afac3fe0b2bb9dd44ebd6821175a5cd2ee04e55b
author Treehugger Robot <treehugger-gerrit@google.com> Tue Oct 02 22:15:38 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 02 22:15:38 2018 +0000
tree 9c08bc53d3753b1bb41c8f8fa38cf4c1431bd76b
parent 5e94856289b36ca9beeeabcb264c863d12db7b3b
parent c4a2534e2da2ae3e0e516b35a83aacf6b750ac4f

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

fs_mgr/fs_mgr_overlayfs.cpp

diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp
index bc3e69e..07b2a7a 100644
--- a/fs_mgr/fs_mgr_overlayfs.cpp
+++ b/fs_mgr/fs_mgr_overlayfs.cpp
@@ -147,10 +147,8 @@
     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) {