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_utils.cpp

diff --git a/init/service_utils.cpp b/init/service_utils.cpp
index 9585d05..a14969e 100644
--- a/init/service_utils.cpp
+++ b/init/service_utils.cpp
@@ -240,15 +240,11 @@
         }
     }
 
-    if (RequiresConsole(attr)) {
+    if (!attr.console.empty()) {
         setsid();
         OpenConsole(attr.console);
     } else {
-        // Without PID namespaces, this call duplicates the setpgid() call from
-        // the parent process. With PID namespaces, this setpgid() call sets the
-        // process group ID for a child of the init process in the PID
-        // namespace.
-        if (setpgid(0, 0) == -1) {
+        if (setpgid(0, getpid()) == -1) {
             return ErrnoError() << "setpgid failed";
         }
         SetupStdio(attr.stdio_to_kmsg);