ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "First-stage mount: avoid triggering a FATAL error"

Browse source
This commit is contained in:
Bowgo Tsai 2018-05-02 02:16:58 +00:00 • committed by Gerrit Code Review
commit 78393951de
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
init/init_first_stage.cpp
View file

@ -119,10 +119,7 @@ static bool inline IsRecoveryMode() {
FirstStageMount::FirstStageMount() FirstStageMount::FirstStageMount()
: need_dm_verity_(false), device_tree_fstab_(fs_mgr_read_fstab_dt(), fs_mgr_free_fstab) { : need_dm_verity_(false), device_tree_fstab_(fs_mgr_read_fstab_dt(), fs_mgr_free_fstab) {
if (!device_tree_fstab_) { if (!device_tree_fstab_) {
// The client of FirstStageMount should check the existence of fstab in device-tree LOG(INFO) << "Failed to read fstab from device tree";
// in advance, without parsing it. Reaching here means there is a FATAL error when
// parsing the fstab. So stop here to expose the failure.
LOG(FATAL) << "Failed to read fstab from device tree";
return; return;
} }
// Stores device_tree_fstab_->recs[] into mount_fstab_recs_ (vector<fstab_rec*>) // Stores device_tree_fstab_->recs[] into mount_fstab_recs_ (vector<fstab_rec*>)