ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

Change-Id: I517eff3c4b49ecae926d5dd2329a5c624663c413
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 02:07:15 +00:00 • committed by Automerger Merge Worker
commit 94df53fcac
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
init/init.cpp
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");