commit c0cf61384a46ac47f83654ae230e022f63bd9874
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jul 31 18:44:38 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 31 18:44:38 2019 +0000
tree a92410d798e95ba3ad2df61eda67810d2cf48d4c
parent 7095e017d45d7a2381ba3e76da3e5fdaa73ab0e0
parent ce3516adb1076e9f3827f11a351f004f91334917

Merge "Revert "fs_mgt: Fix remount failure in case of non-overlayfs system""

fs_mgr/fs_mgr_overlayfs.cpp

diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp
index 2f0bf7d..ac15ce4 100644
--- a/fs_mgr/fs_mgr_overlayfs.cpp
+++ b/fs_mgr/fs_mgr_overlayfs.cpp
@@ -1009,7 +1009,7 @@
     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;
         }