commit 15e957d3f60d61dff48c5f99447300e6ba320521
author Tao Bao <tbao@google.com> Tue Sep 04 10:19:35 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Sep 04 10:19:35 2018 -0700
tree f8bc98553785b0d1ab524b0aa0d62cc4e6a32662
parent baa841ed04cdb6bf904ac95b30946b4e762086f5
parent a062fae9d7c69b2e701e3c27ac34fef506f67218

Merge "support mounting f2fs in recovery mode"
am: a062fae9d7

Change-Id: I5f9798c1d901e98240831297aadadf39158cf2fc

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