From 814cbfa10e0c8aa6f6291fc42549035c7c7e3afe Mon Sep 17 00:00:00 2001 From: Ryan Savitski Date: Tue, 30 Jul 2019 12:01:46 +0000 Subject: [PATCH] Revert "fs_mgt: Fix remount failure in case of non-overlayfs system" This reverts commit 588fe9e8af68e943654ab47bfb18cee9587a7332. Reason for revert: definite cause for test failure Test: adb-remount-test.sh Bug: 138407617 Fixes: 138622072 Change-Id: If2fee8873dd7d4360e7ff5572a0481247beffbca --- fs_mgr/fs_mgr_overlayfs.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp index 2f0bf7d38..ac15ce483 100644 --- a/fs_mgr/fs_mgr_overlayfs.cpp +++ b/fs_mgr/fs_mgr_overlayfs.cpp @@ -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; }