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

Commit d7f22a4f authored by Chun-Wei Wang's avatar Chun-Wei Wang Committed by Automerger Merge Worker
Browse files

Merge "Export active dsu slot to system prop" am: 3e0baf86 am: a165dd0c am: 94df53fc 

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



Change-Id: Ib6fb5f55784ed80338e194fc29025d3d620534d1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8ae5fa5e 94df53fc

init/init.cpp

+6 −0
Original line number Diff line number Diff line
@@ -1043,6 +1043,12 @@ int SecondStageMain(int argc, char** argv) { 
    SetProperty(gsi::kGsiBootedProp, is_running);

    auto is_installed = android::gsi::IsGsiInstalled() ? "1" : "0";

    SetProperty(gsi::kGsiInstalledProp, is_installed);

    if (android::gsi::IsGsiRunning()) {

        std::string dsu_slot;

        if (android::gsi::GetActiveDsu(&dsu_slot)) {

            SetProperty(gsi::kDsuSlotProp, dsu_slot);

        }

    }



    am.QueueBuiltinAction(SetupCgroupsAction, "SetupCgroups");

    am.QueueBuiltinAction(SetKptrRestrictAction, "SetKptrRestrict");