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

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

Merge "fs_mgr: overlayfs: system as root can not detect shared blocks (taimen)" am: a24338bf

am: 7880279a

Change-Id: I3aaf4b4506432f5f0a3c82e053886b3e78e65c60
parents 9dc08bd4 7880279a
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -157,7 +157,12 @@ bool fs_mgr_overlayfs_enabled(FstabEntry* entry) {
        fs_mgr_update_logical_partition(entry);
    }
    auto save_errno = errno;
    errno = 0;
    auto has_shared_blocks = fs_mgr_has_shared_blocks(entry->mount_point, entry->blk_device);
    // special case for first stage init for system as root (taimen)
    if (!has_shared_blocks && (errno == ENOENT) && (entry->blk_device == "/dev/root")) {
        has_shared_blocks = true;
    }
    errno = save_errno;
    return has_shared_blocks;
}