Merge "init: Don't fail first stage mount for formattable partitions." am: bcede5f61a

am: 009dd524fb

Change-Id: Ia8d1fd81dd815e2bab26a619ba1d302c9a648281
This commit is contained in:
David Anderson 2018-12-21 00:15:37 -08:00 committed by android-build-merger
commit dc03d2cb81

View file

@ -395,6 +395,11 @@ bool FirstStageMount::MountPartition(FstabEntry* fstab_entry) {
return false;
}
if (fs_mgr_do_mount_one(*fstab_entry)) {
if (fstab_entry->fs_mgr_flags.formattable) {
PLOG(INFO) << "Failed to mount '" << fstab_entry->mount_point << "', "
<< "ignoring mount for formattable partition";
return true;
}
PLOG(ERROR) << "Failed to mount '" << fstab_entry->mount_point << "'";
return false;
}