commit 884b1a5b0c2d34b075d8cd594e9d734722d60bbb
author Tao Bao <tbao@google.com> Tue Sep 04 10:40:53 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Sep 04 10:40:53 2018 -0700
tree f8bc98553785b0d1ab524b0aa0d62cc4e6a32662
parent 4ca55f202e9fc183824d2375bd0b7467bbaeed34
parent 6b4a2c4553ff320fe3a335378cdd9657bad40a35

Merge "support mounting f2fs in recovery mode" am: a062fae9d7 am: 15e957d3f6
am: 6b4a2c4553

Change-Id: I0276732b6acd77541172d612587abba9222ab484

roots.cpp

diff --git a/roots.cpp b/roots.cpp
index 06a77c1..c29771a 100644
--- a/roots.cpp
+++ b/roots.cpp
@@ -126,7 +126,7 @@
   mkdir(mount_point, 0755);  // in case it doesn't already exist
 
   if (strcmp(v->fs_type, "ext4") == 0 || strcmp(v->fs_type, "squashfs") == 0 ||
-      strcmp(v->fs_type, "vfat") == 0) {
+      strcmp(v->fs_type, "vfat") == 0 || strcmp(v->fs_type, "f2fs") == 0) {
     int result = mount(v->blk_device, mount_point, v->fs_type, v->flags, v->fs_options);
     if (result == -1 && fs_mgr_is_formattable(v)) {
       PLOG(ERROR) << "Failed to mount " << mount_point << "; formatting";