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

am: 6b4a2c4553

Change-Id: I0276732b6acd77541172d612587abba9222ab484
This commit is contained in:
Tao Bao
2018-09-04 10:40:53 -07:00
committed by android-build-merger
+1 -1
View File
@@ -126,7 +126,7 @@ int ensure_path_mounted_at(const char* path, const char* mount_point) {
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";