Merge "First-stage mount: avoid triggering a FATAL error" (d8829d7a) · Commits · e / os / android_system_core

init/init_first_stage.cpp

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -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*>)