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

Commit 254cbab9 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "fs_mgr: fs_mgr_overlayfs_teardown_one failure to teardown scratch"

am: 30fa1b78

Change-Id: I7a2a581d0cce4bd4b85e477529ea77893111041c
parents ebce8ca9 30fa1b78
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ bool fs_mgr_overlayfs_teardown_one(const std::string& overlay, const std::string
                                   bool* change) {
    const auto top = overlay + kOverlayTopDir;

    if (!fs_mgr_access(top)) return false;
    if (!fs_mgr_access(top)) return fs_mgr_overlayfs_teardown_scratch(overlay, change);

    auto cleanup_all = mount_point.empty();
    const auto oldpath = top + (cleanup_all ? "" : ("/" + mount_point));