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

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

Merge "fs_mgr: skip fs_mgr_overlayfs_required_devices w/o overlayfs in kernel" am: cbc41163

am: c4df6be0

Change-Id: I24c6ed419bbebf346c7022617f9e267d09c51efc
parents 474983e2 c4df6be0
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -790,6 +790,8 @@ bool fs_mgr_overlayfs_mount_all(const std::vector<const fstab_rec*>& fsrecs) {
}

std::vector<std::string> fs_mgr_overlayfs_required_devices(fstab* fstab) {
    if (fs_mgr_overlayfs_valid() == OverlayfsValidResult::kNotSupported) return {};

    if (fs_mgr_get_entry_for_mount_point(const_cast<struct fstab*>(fstab), kScratchMountPoint)) {
        return {};
    }