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

Commit 4a391cf5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "system_dlkm: Allow overlayfs mount for user build" am: 45df5688 am:... 

Merge "system_dlkm: Allow overlayfs mount for user build" am: 45df5688 am: 5180d301 am: 604c0a08

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1975708

Change-Id: I4636d11b583e692d14b2b160ba8d837c2ff33e37
parents 14f3fb79 604c0a08

fs_mgr/fs_mgr.cpp

+2 −1
Original line number Diff line number Diff line
@@ -2256,7 +2256,8 @@ bool fs_mgr_mount_overlayfs_fstab_entry(const FstabEntry& entry) { 
#if ALLOW_ADBD_DISABLE_VERITY == 0

    // Allowlist the mount point if user build.

    static const std::vector<const std::string> kAllowedPaths = {

            "/odm", "/odm_dlkm", "/oem", "/product", "/system_ext", "/vendor", "/vendor_dlkm",

            "/odm",         "/odm_dlkm",   "/oem",    "/product",

            "/system_dlkm", "/system_ext", "/vendor", "/vendor_dlkm",

    };

    static const std::vector<const std::string> kAllowedPrefixes = {

            "/mnt/product/",