Merge "fs_mgr: fs_mgr_overlayfs_teardown_one failure to teardown scratch"

This commit is contained in:
Treehugger Robot 2018-10-18 21:23:43 +00:00 committed by Gerrit Code Review
commit 30fa1b7864

View file

@ -446,7 +446,7 @@ bool fs_mgr_overlayfs_teardown_one(const std::string& overlay, const std::string
bool* change) { bool* change) {
const auto top = overlay + kOverlayTopDir; 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(); auto cleanup_all = mount_point.empty();
const auto oldpath = top + (cleanup_all ? "" : ("/" + mount_point)); const auto oldpath = top + (cleanup_all ? "" : ("/" + mount_point));