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

Commit 3a08c73a authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

fs_mgr: skip fs_mgr_overlayfs_required_devices w/o overlayfs in kernel

Check if overlayfs is supplied in the kernel before proceeding to
determining if there is a disabled verity and an overlayfs filesystem
to deploy.

Test: adb-remount-test.sh
Bug: 119929969
Change-Id: I28116f0aa6959040bb9f38f46c058a221591f735
parent 4055587d
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 {};
    }