summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBowgo Tsai2018-05-01 21:16:58 -0500
committerGerrit Code Review2018-05-01 21:16:58 -0500
commit78393951de05ef60456f23d959400125684d7f7a (patch)
tree6ab09ba73c032bbddd6a5ceb745fadb43d7c4706
parent8ef8d1eb6ba51d382fb4b6886b3d497ac2a45973 (diff)
parent8fe363f26017e39b80c6cd793f7b2a346da88104 (diff)
downloadplatform-system-core-78393951de05ef60456f23d959400125684d7f7a.tar.gz
platform-system-core-78393951de05ef60456f23d959400125684d7f7a.tar.xz
platform-system-core-78393951de05ef60456f23d959400125684d7f7a.zip
Merge "First-stage mount: avoid triggering a FATAL error"
-rw-r--r--init/init_first_stage.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/init/init_first_stage.cpp b/init/init_first_stage.cpp
index 0f4cc68a2..45d3d4499 100644
--- a/init/init_first_stage.cpp
+++ b/init/init_first_stage.cpp
@@ -119,10 +119,7 @@ static bool inline IsRecoveryMode() {
119FirstStageMount::FirstStageMount() 119FirstStageMount::FirstStageMount()
120 : need_dm_verity_(false), device_tree_fstab_(fs_mgr_read_fstab_dt(), fs_mgr_free_fstab) { 120 : need_dm_verity_(false), device_tree_fstab_(fs_mgr_read_fstab_dt(), fs_mgr_free_fstab) {
121 if (!device_tree_fstab_) { 121 if (!device_tree_fstab_) {
122 // The client of FirstStageMount should check the existence of fstab in device-tree 122 LOG(INFO) << "Failed to read fstab from device tree";
123 // in advance, without parsing it. Reaching here means there is a FATAL error when
124 // parsing the fstab. So stop here to expose the failure.
125 LOG(FATAL) << "Failed to read fstab from device tree";
126 return; 123 return;
127 } 124 }
128 // Stores device_tree_fstab_->recs[] into mount_fstab_recs_ (vector<fstab_rec*>) 125 // Stores device_tree_fstab_->recs[] into mount_fstab_recs_ (vector<fstab_rec*>)