Merge "Export active dsu slot to system prop" am: 3e0baf8642

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

Change-Id: If1906d70caaf78602ccee912f780f528cbd710fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chun-Wei Wang 2023-05-16 01:24:26 +00:00 committed by Automerger Merge Worker
commit a165dd0cf3

View file

@ -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");