commit 6a45809e620fa22be9f41a5d08686381c14bd50f
author David Anderson <dvander@google.com> Thu Jun 08 16:57:41 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 08 16:57:41 2023 +0000
tree c4755edaca6b04a3fcf31eddc3bd23ad230617ad
parent b7fc413279ff822c5b0f5dfcea411f28059fc5db
parent 1ae6f6c94de30134cbd6cc2347a667eb765da36b

Merge "vts_fs_test: Relax filesystem constraints for fixed partitions." into udc-dev am: 7f5512dcd0 am: 1ae6f6c94d

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

Change-Id: Id6f30d3d65b017d1f03086747ba56c347489de62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index be1ebee..da63fdc 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -1043,6 +1043,12 @@
     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");