From 1c3fddfaf72f24f94da4d3d1a473ab2abeaa77b7 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Fri, 2 Dec 2022 16:25:47 +0100 Subject: [PATCH] quadlet: Change RunInit default to no This matches the default of podman run. Signed-off-by: Alexander Larsson --- docs/source/markdown/podman-systemd.unit.5.md | 4 ++-- pkg/systemd/quadlet/quadlet.go | 2 +- test/e2e/quadlet/basic.container | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/source/markdown/podman-systemd.unit.5.md b/docs/source/markdown/podman-systemd.unit.5.md index 3bad70bdc5..7f62cb67c6 100644 --- a/docs/source/markdown/podman-systemd.unit.5.md +++ b/docs/source/markdown/podman-systemd.unit.5.md @@ -190,9 +190,9 @@ of startup on its own. The timezone to run the container in. -#### `RunInit=` (default to `yes`) +#### `RunInit=` (default to `no`) -If enabled (and it is by default), the container will have a minimal init process inside the +If enabled, the container will have a minimal init process inside the container that forwards signals and reaps processes. #### `VolatileTmp=` (default to `yes`) diff --git a/pkg/systemd/quadlet/quadlet.go b/pkg/systemd/quadlet/quadlet.go index 840cb8c4a0..45560680ec 100644 --- a/pkg/systemd/quadlet/quadlet.go +++ b/pkg/systemd/quadlet/quadlet.go @@ -276,7 +276,7 @@ func ConvertContainer(container *parser.UnitFile, isUser bool) (*parser.UnitFile } // Run with a pid1 init to reap zombies by default (as most apps don't do that) - runInit := container.LookupBoolean(ContainerGroup, KeyRunInit, true) + runInit := container.LookupBoolean(ContainerGroup, KeyRunInit, false) if runInit { podman.add("--init") } diff --git a/test/e2e/quadlet/basic.container b/test/e2e/quadlet/basic.container index 9929e6ec41..21e04efdda 100644 --- a/test/e2e/quadlet/basic.container +++ b/test/e2e/quadlet/basic.container @@ -6,7 +6,6 @@ ## assert-podman-args "-d" ## assert-podman-args "--log-driver" "passthrough" ## assert-podman-args "--pull=never" -## assert-podman-args "--init" ## assert-podman-args "--runtime" "/usr/bin/crun" ## assert-podman-args "--cgroups=split" ## assert-podman-args "--sdnotify=conmon"