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

Commit 2ecb2e9f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add erofs to supported fs type" am: 8571b761 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b80de12a663a61a83232fce701802e9089eb5b7
parents ebcf0925 8571b761

fs_mgr/fs_mgr_roots.cpp

+2 −1
Original line number Diff line number Diff line
@@ -111,7 +111,8 @@ bool EnsurePathMounted(Fstab* fstab, const std::string& path, const std::string& 
        return true;

    }



    static const std::vector<std::string> supported_fs{"ext4", "squashfs", "vfat", "f2fs", "none"};

    static const std::vector<std::string> supported_fs{"ext4", "squashfs", "vfat", "f2fs", "erofs",

                                                       "none"};

    if (std::find(supported_fs.begin(), supported_fs.end(), rec->fs_type) == supported_fs.end()) {

        LERROR << "unknown fs_type \"" << rec->fs_type << "\" for " << mount_point;

        return false;