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

am: 1cb55cff36

Change-Id: Ic44966a40848d8ad169b97475317d43dcafb3142
This commit is contained in:
Mark Salyzyn 2019-07-29 14:51:32 -07:00 committed by android-build-merger
commit f39aa377f4

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;
}