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

Commit 60dd4690 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 7d294906 9d036106

fs_mgr/fs_mgr_remount.cpp

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

    BAD_OVERLAY,

    NO_MOUNTS,

    NO_MOUNTS,

    REMOUNT_FAILED,

    REMOUNT_FAILED,

    MUST_REBOOT,

    BINDER_ERROR,

    BINDER_ERROR,

    CHECKPOINTING,

    CHECKPOINTING,

    GSID_ERROR,

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

        } else {

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

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

        }

        }

        return MUST_REBOOT;

        return REMOUNT_SUCCESS;

    }

    }

    if (result == REMOUNT_SUCCESS) {

    if (result == REMOUNT_SUCCESS) {

        printf("remount succeeded\n");

        printf("remount succeeded\n");