openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "first stage mount: abort when failed to parse fstab in device-tree"

This commit is contained in:
Treehugger Robot 2017-11-11 01:48:30 +00:00 committed by Gerrit Code Review
parent 0626f7205e ec19cf6306
commit d0d7346dc7
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs_mgr/fs_mgr_slotselect.cpp
View File

@ -40,7 +40,7 @@ bool fs_mgr_update_for_slotselect(struct fstab *fstab) {
char *tmp;
if (ab_suffix.empty()) {
ab_suffix = fs_mgr_get_slot_suffix();
// Returns false as non A/B devices should not have MF_SLOTSELECT.
// Return false if failed to get ab_suffix when MF_SLOTSELECT is specified.
if (ab_suffix.empty()) return false;
}
if (asprintf(&tmp, "%s%s", fstab->recs[n].blk_device, ab_suffix.c_str()) > 0) {

5
init/init_first_stage.cpp
View File

@ -118,7 +118,10 @@ static bool inline IsRecoveryMode() {
FirstStageMount::FirstStageMount()
: need_dm_verity_(false), device_tree_fstab_(fs_mgr_read_fstab_dt(), fs_mgr_free_fstab) {
if (!device_tree_fstab_) {
LOG(ERROR) << "Failed to read fstab from device tree";
// The client of FirstStageMount should check the existence of fstab in 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;
}
// Stores device_tree_fstab_->recs[] into mount_fstab_recs_ (vector<fstab_rec*>)