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

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

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

am: bc35f067

Change-Id: I37ff36f51b9f0abe8222e872717519bb2c5af07d
parents 262a8bba bc35f067

fs_mgr/fs_mgr_overlayfs.cpp

+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;

    }