commit ea928bbc1f3b82e854048021a250eea235f993d7
author Mark Salyzyn <salyzyn@google.com> Wed Aug 29 10:44:33 2018 -0700
committer Mark Salyzyn <salyzyn@google.com> Fri Oct 05 15:23:53 2018 -0700
tree b7bb1c59d40ff67b1651ae52dc346e1e1b661493
parent 64990d5b457da61a150f39193dda5479cc32da20

fs_mgr: candidate list check mount_point

if we specify mount_point /vendor, candidate list should not add
/system as a candidate.  eg: adb disable-verity /vendor.

Test: manual
Bug: 109821005
Change-Id: Id4d9ee617262cf1b68a790c9c43476d0f907353a

fs_mgr/fs_mgr_overlayfs.cpp

diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp
index 1edd573..a609d51 100644
--- a/fs_mgr/fs_mgr_overlayfs.cpp
+++ b/fs_mgr/fs_mgr_overlayfs.cpp
@@ -471,6 +471,7 @@
     if ((std::find(mounts.begin(), mounts.end(), "/system") == mounts.end()) &&
         !fs_mgr_get_entry_for_mount_point(const_cast<struct fstab*>(fstab), "/") &&
         !fs_mgr_get_entry_for_mount_point(const_cast<struct fstab*>(fstab), "/system") &&
+        (!mount_point || ("/system"s == mount_point)) &&
         !fs_mgr_overlayfs_verity_enabled("system")) {
         mounts.emplace_back("/system");
     }