Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b540d941 authored by Ryan Savitski's avatar Ryan Savitski Committed by android-build-merger
Browse files

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

Merge "Revert "fs_mgt: Fix remount failure in case of non-overlayfs system"" am: ae898442 am: 53fd2449
am: 843c83ab

Change-Id: Icba1efeb123287d64064775cf70ff5c2b04ad0b4
parents 3b179730 843c83ab

fs_mgr/fs_mgr_overlayfs.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -1009,7 +1009,7 @@ Fstab fs_mgr_overlayfs_candidate_list(const Fstab& fstab) { 
    Fstab candidates;

    Fstab candidates;

    for (const auto& entry : fstab) {

    for (const auto& entry : fstab) {

        FstabEntry new_entry = entry;

        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)) {

            !fs_mgr_wants_overlayfs(&new_entry)) {

            continue;

            continue;

        }

        }