commit ebb631b0a32556cdeda70d3bf9e6f6460667b42f
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 30 22:20:39 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 30 22:20:39 2018 +0000
tree 03e830627aaed0429603cc265fa0b6bb9011c961
parent 5fdd77b2f1ce20c4a03c1f4c6affd1a919771748
parent eafc1c3d581b39f38344a7045033e74bf3008f3d

Merge "init: First Stage Mount observe nofail mount flag"

init/first_stage_mount.cpp

diff --git a/init/first_stage_mount.cpp b/init/first_stage_mount.cpp
index 1496935..fa3392e 100644
--- a/init/first_stage_mount.cpp
+++ b/init/first_stage_mount.cpp
@@ -375,7 +375,7 @@
     }
 
     for (auto fstab_rec : mount_fstab_recs_) {
-        if (!MountPartition(fstab_rec)) {
+        if (!MountPartition(fstab_rec) && !fs_mgr_is_nofail(fstab_rec)) {
             return false;
         }
     }