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

Commit bc35f067 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "fs_mgr: overlayfs: if existing scratch mountpoint is system_empty"

parents c08c8080 df8cf188
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -751,9 +751,15 @@ bool fs_mgr_overlayfs_setup_scratch(const Fstab& fstab, bool* change) {
    auto mnt_type = fs_mgr_overlayfs_scratch_mount_type();
    if (partition_exists) {
        if (fs_mgr_overlayfs_mount_scratch(scratch_device, mnt_type)) {
            if (!fs_mgr_access(kScratchMountPoint + kOverlayTopDir) &&
                !fs_mgr_filesystem_has_space(kScratchMountPoint)) {
                // declare it useless, no overrides and no free space
                fs_mgr_overlayfs_umount_scratch();
            } else {
                if (change) *change = true;
                return true;
            }
        }
        // partition existed, but was not initialized; fall through to make it.
        errno = 0;
    }