From eafc1c3d581b39f38344a7045033e74bf3008f3d Mon Sep 17 00:00:00 2001
From: Mark Salyzyn <salyzyn@google.com>
Date: Wed, 29 Aug 2018 16:58:52 -0700
Subject: [PATCH] init: First Stage Mount observe nofail mount flag
MountPartitions should respect nofail. The nofail flag makes the
partition optional.
Test: manual (future code using feature), and smoke test
Bug: 109821005
Bug: 78914864
Change-Id: I715a66ef1abbe223b0cefe5bd2758f63352b1afc
---
init/first_stage_mount.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/init/first_stage_mount.cpp b/init/first_stage_mount.cpp
index 1496935d6d..fa3392e065 100644
--- a/init/first_stage_mount.cpp
+++ b/init/first_stage_mount.cpp
@@ -375,7 +375,7 @@ bool FirstStageMount::MountPartitions() {
}
for (auto fstab_rec : mount_fstab_recs_) {
- if (!MountPartition(fstab_rec)) {
+ if (!MountPartition(fstab_rec) && !fs_mgr_is_nofail(fstab_rec)) {
return false;
}
}
--
GitLab