Merge pull request #267 from giuseppe/always-setsid

libcrun: always use setsid
containers · Feb 13, 2020 · 474b927 · 474b927
2 parents bbb1fa9 + 2c681f8
commit 474b927
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/src/libcrun/container.c b/src/libcrun/container.c
@@ -680,14 +680,14 @@ container_init_setup (void *args, const char *notify_socket,
         }
     }
 
+  ret = setsid ();
+  if (UNLIKELY (ret < 0))
+    return crun_make_error (err, errno, "setsid");
+
   if (has_terminal)
     {
       cleanup_close int terminal_fd = -1;
 
-      ret = setsid ();
-      if (UNLIKELY (ret < 0))
-        return crun_make_error (err, errno, "setsid");
-
       fflush (stderr);
 
       terminal_fd = libcrun_set_terminal (container, err);

diff --git a/src/libcrun/linux.c b/src/libcrun/linux.c
@@ -2916,12 +2916,6 @@ libcrun_join_process (libcrun_container_t *container, pid_t pid_to_join, libcrun
   for (i = 0; all_namespaces[i]; i++)
     close_and_reset (&fds[i]);
 
-  if (detach && setsid () < 0)
-    {
-      crun_make_error (err, errno, "setsid");
-      goto exit;
-    }
-
   /* We need to fork once again to join the PID namespace.  */
   pid = fork ();
   if (UNLIKELY (pid < 0))