Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78393951 authored by Bowgo Tsai's avatar Bowgo Tsai Committed by Gerrit Code Review
Browse files

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

parents 8ef8d1eb 8fe363f2
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -119,10 +119,7 @@ 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_) {
        // 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";
        LOG(INFO) << "Failed to read fstab from device tree";
        return;
    }
    // Stores device_tree_fstab_->recs[] into mount_fstab_recs_ (vector<fstab_rec*>)