Merge "fs_mgt: Fix remount failure in case of non-overlayfs system" am: 09bbdcb6b3 am: 8e54c6e8c1 am: 1cb55cff36

am: f39aa377f4

Change-Id: Iee6d194836c5a6214715375675f7624e573ef9f3
This commit is contained in:
Mark Salyzyn 2019-07-29 15:19:24 -07:00 committed by android-build-merger
commit a5ee9dac77

View file

@ -1009,7 +1009,7 @@ Fstab fs_mgr_overlayfs_candidate_list(const Fstab& fstab) {
Fstab candidates;
for (const auto& entry : fstab) {
FstabEntry new_entry = entry;
if (!fs_mgr_overlayfs_already_mounted(entry.mount_point) &&
if (!fs_mgr_overlayfs_already_mounted(entry.mount_point) ||
!fs_mgr_wants_overlayfs(&new_entry)) {
continue;
}