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

Commit 4bb5aef0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "first_stage_mount: Fix log typo "check_at_most_once"" am: 4bc52771... 

Merge "first_stage_mount: Fix log typo "check_at_most_once"" am: 4bc52771 am: f8415fdc am: 91dbaf0a

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2146961



Change-Id: I4591f449e87f261fba09cb8ec9c858d5150c5641
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2b4531be 91dbaf0a

init/first_stage_mount.cpp

+7 −7
Original line number Diff line number Diff line
@@ -507,17 +507,17 @@ bool FirstStageMount::TrySwitchSystemAsRoot() { 
        SaveRamdiskPathToSnapuserd();

    }



    if (MountPartition(system_partition, false /* erase_same_mounts */)) {

        if (dsu_not_on_userdata_ && fs_mgr_verity_is_check_at_most_once(*system_partition)) {

            LOG(ERROR) << "check_most_at_once forbidden on external media";

    if (!MountPartition(system_partition, false /* erase_same_mounts */)) {

        PLOG(ERROR) << "Failed to mount /system";

        return false;

    }

        SwitchRoot("/system");

    } else {

        PLOG(ERROR) << "Failed to mount /system";

    if (dsu_not_on_userdata_ && fs_mgr_verity_is_check_at_most_once(*system_partition)) {

        LOG(ERROR) << "check_at_most_once forbidden on external media";

        return false;

    }



    SwitchRoot("/system");



    return true;

}