commit d683a00490843d96eacd1ca22bc511f998fc7fd8
author David Anderson <dvander@google.com> Fri Dec 21 00:07:23 2018 -0800
committer android-build-merger <android-build-merger@google.com> Fri Dec 21 00:07:23 2018 -0800
tree e3062c7177c9c0fd5d55c37795461a5e53ff7845
parent 60714194d999648b1fc3cc45d931c07febc28c19
parent e5d41dbbcd5c478ac795becdf737a5ec93afa11a

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

Change-Id: Id77282333c9608a844d2470e100d686f62ae8c95

init/first_stage_mount.cpp

diff --git a/init/first_stage_mount.cpp b/init/first_stage_mount.cpp
index acefdf0..b5ff658 100644
--- a/init/first_stage_mount.cpp
+++ b/init/first_stage_mount.cpp
@@ -395,6 +395,11 @@
         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;
     }