container: Set primary process to 1 via LISTEN_PID by default if user…

… configuration is missing Signed-off-by: flouthoc <flouthoc.git@gmail.com>
containers · Aug 25, 2021 · fd2c5a6 · fd2c5a6
1 parent 6ecf5a5
commit fd2c5a6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -68,3 +68,4 @@ tests/tests_*
 tests/*.log
 tests/*.trs
 test-suite.log
+tags
diff --git a/src/libcrun/container.c b/src/libcrun/container.c
@@ -1187,6 +1187,13 @@ container_init_setup (void *args, pid_t own_pid, char *notify_socket, int sync_s
   if (clearenv ())
     return crun_make_error (err, errno, "clearenv");
 
+  // set primary process to 1 explicitly if nothing is configured and LISTEN_FD is not set
+  if (getenv ("LISTEN_PID") == NULL && entrypoint_args->context->preserve_fds == 0)
+    {
+      setenv ("LISTEN_PID", "1", 1);
+      libcrun_warning ("setting LISTEN_PID=1 since no previous configuration was found");
+    }
+
   if (def->process)
     {
       size_t i;