summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2020-05-08 10:30:57 +0200
committerValentin Rothberg <rothberg@redhat.com>2020-05-08 10:53:11 +0200
commit676efd89d5ff4eb8f473fbd994809cc263cf504a (patch)
tree05f8b3a453cd83ade0ae174ff54e604adcaeb21a /cmd
parentab518cdba02b85a32d3c2bce4c0b65dcdea4dfcc (diff)
downloadpodman-676efd89d5ff4eb8f473fbd994809cc263cf504a.tar.gz
podman-676efd89d5ff4eb8f473fbd994809cc263cf504a.tar.bz2
podman-676efd89d5ff4eb8f473fbd994809cc263cf504a.zip
set --conmon-pidfile
The --conmon-pidfile was not set in the spec leading to failing systemd units. Also add a system test to prevent future regressions. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'cmd')
-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