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

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

Merge "remount: On initial overlay setup, return 0 instead of MUST_REBOOT" am:... 

Merge "remount: On initial overlay setup, return 0 instead of MUST_REBOOT" am: 60dd4690 am: 792984a5

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



Change-Id: Iae5d627c577f490533e3bd93389234bd913da4a6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e933cee8 792984a5

fs_mgr/fs_mgr_remount.cpp

+1 −2
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ enum RemountStatus { 
    BAD_OVERLAY,

    NO_MOUNTS,

    REMOUNT_FAILED,

    MUST_REBOOT,

    BINDER_ERROR,

    CHECKPOINTING,

    GSID_ERROR,
@@ -581,7 +580,7 @@ int main(int argc, char* argv[]) { 
        } else {

            LOG(INFO) << "Now reboot your device for settings to take effect";

        }

        return MUST_REBOOT;

        return REMOUNT_SUCCESS;

    }

    if (result == REMOUNT_SUCCESS) {

        printf("remount succeeded\n");