commit f079856ba8aab76551bb4993f8901d0f9e6d75c1
author Yifan Hong <elsk@google.com> Mon Jan 07 10:40:07 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Jan 07 10:40:07 2019 -0800
tree 8c7ba6868c7729bdc000c5a33ab995697989f9c4
parent 041dff81a65f6414873a325566b4eae171d478df
parent 4b181aec46e23ab8c31dcf6cefa5804fe75f29d4

Merge "Add none to supported fs type"
am: 789d905b50

Change-Id: I8d1cab2b9454bfb4657116d11dbedcc967718493

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;