commit f26e59ebba1de464999ea013cbf0b98a4419d337
author Bart Van Assche <bvanassche@google.com> Tue Nov 15 00:24:39 2022 +0000
committer Bart Van Assche <bvanassche@google.com> Tue Nov 15 00:55:45 2022 +0000
tree 773ef85f43d195103be6f34608cf7f21116afd76
parent 15e5ecdcd7ea69e63387346bd235fbeb3e3597df

Revert "init: Fix a race condition in KillProcessGroup()"

This reverts commit 15e5ecdcd7ea69e63387346bd235fbeb3e3597df.

Reason for revert: breaks console support.
Bug: 213617178
Bug: 258754901
Change-Id: Iffe213e2cd295461a427621f2b84933f1bebd39f

init/service.h

diff --git a/init/service.h b/init/service.h
index 2c2778d..b2c9909 100644
--- a/init/service.h
+++ b/init/service.h
@@ -155,7 +155,7 @@
     void ResetFlagsForStart();
     Result<void> CheckConsole();
     void ConfigureMemcg();
-    void RunService(const std::vector<Descriptor>& descriptors, InterprocessFifo fifo);
+    void RunService(const std::vector<Descriptor>& descriptors, InterprocessFifo cgroups_activated);
     void SetMountNamespace();
     static unsigned long next_start_order_;
     static bool is_exec_service_running_;