commit df2cd7001cc96ab7dc6deb2a64c3c899d744b330
author Yifan Hong <elsk@google.com> Mon Jan 07 11:12:02 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Jan 07 11:12:02 2019 -0800
tree b256f85f7f5ce38c0e80cd4e4de6c785c498cf53
parent 40569422ca0c2a91d534a4864d403c2dce8e01b7
parent 33df7f8d55efb582c00434c1e2dedfcf90f04267

Merge "Add none to supported fs type" am: 789d905b50 am: 8f88fe4c88
am: 81f568960f

Change-Id: I7e95ccc9ff851ebe322887fa3300b37966c42d37

fs_mgr/fs_mgr_roots.cpp

diff --git a/fs_mgr/fs_mgr_roots.cpp b/fs_mgr/fs_mgr_roots.cpp
index f44ff41..32a5d21 100644
--- a/fs_mgr/fs_mgr_roots.cpp
+++ b/fs_mgr/fs_mgr_roots.cpp
@@ -114,7 +114,7 @@
 
     const std::string mount_point = mount_pt.empty() ? rec->mount_point : mount_pt;
 
-    static const std::vector<std::string> supported_fs{"ext4", "squashfs", "vfat", "f2fs"};
+    static const std::vector<std::string> supported_fs{"ext4", "squashfs", "vfat", "f2fs", "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;