summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2020-05-08 13:04:59 +0200
committerGitHub <noreply@github.com>2020-05-08 13:04:59 +0200
commitff1c59065e9d2ef0c03ce8de444b489630d00b3c (patch)
tree3923827125e9f097a384df5196831014fc68d9a1 /cmd/podman
parent241d78351e1efaf1cc4bb1e0f33741c1b585d7c4 (diff)
parent676efd89d5ff4eb8f473fbd994809cc263cf504a (diff)
downloadpodman-ff1c59065e9d2ef0c03ce8de444b489630d00b3c.tar.gz
podman-ff1c59065e9d2ef0c03ce8de444b489630d00b3c.tar.bz2
podman-ff1c59065e9d2ef0c03ce8de444b489630d00b3c.zip
Merge pull request #6130 from vrothberg/pidfile
set --conmon-pidfile
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/common/specgen.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go
index 9a2345064..ff7c39de2 100644
--- a/cmd/podman/common/specgen.go
+++ b/cmd/podman/common/specgen.go
@@ -501,6 +501,7 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string
s.CapDrop = c.CapDrop
s.Privileged = c.Privileged
s.ReadOnlyFilesystem = c.ReadOnly
+ s.ConmonPidFile = c.ConmonPIDFile
// TODO
// ouitside of specgen and oci though