opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-26 02:35:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

quadlet: Change RunInit default to no

Browse Source 
This matches the default of podman run.

Signed-off-by: Alexander Larsson <alexl@redhat.com>
This commit is contained in:
Alexander Larsson
2022-12-02 16:25:47 +01:00
parent d19ea6a60d
commit 1c3fddfaf7
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/source/markdown/podman-systemd.unit.5.md
View File

@ -190,9 +190,9 @@ of startup on its own.
The timezone to run the container in. 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. container that forwards signals and reaps processes.
#### `VolatileTmp=` (default to `yes`) #### `VolatileTmp=` (default to `yes`)

2
pkg/systemd/quadlet/quadlet.go
View File

@ -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) // 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 { if runInit {
podman.add("--init") podman.add("--init")
} }

1
test/e2e/quadlet/basic.container
View File

@ -6,7 +6,6 @@
## assert-podman-args "-d" ## assert-podman-args "-d"
## assert-podman-args "--log-driver" "passthrough" ## assert-podman-args "--log-driver" "passthrough"
## assert-podman-args "--pull=never" ## assert-podman-args "--pull=never"
## assert-podman-args "--init"
## assert-podman-args "--runtime" "/usr/bin/crun" ## assert-podman-args "--runtime" "/usr/bin/crun"
## assert-podman-args "--cgroups=split" ## assert-podman-args "--cgroups=split"
## assert-podman-args "--sdnotify=conmon" ## assert-podman-args "--sdnotify=conmon"