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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b80de12a663a61a83232fce701802e9089eb5b7
This commit is contained in:
Treehugger Robot 2020-12-09 20:29:26 +00:00 committed by Automerger Merge Worker
commit 2ecb2e9f26

View file

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