summaryrefslogtreecommitdiff
path: root/libpod/runtime_pod_infra_linux.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-06-11 10:56:11 -0400
committerGitHub <noreply@github.com>2020-06-11 10:56:11 -0400
commit39ad0387ca27097875b02b55c6f71c2f2b8bdd6c (patch)
tree0c870e02eb98c1f1db60d5dd44e7ebf2a7450335 /libpod/runtime_pod_infra_linux.go
parentf1b6840382ffdfe9811c64b3aea75218d9b14e5e (diff)
parentc7c81a8c081f6f7458345027f315a796d6ca5eda (diff)
downloadpodman-39ad0387ca27097875b02b55c6f71c2f2b8bdd6c.tar.gz
podman-39ad0387ca27097875b02b55c6f71c2f2b8bdd6c.tar.bz2
podman-39ad0387ca27097875b02b55c6f71c2f2b8bdd6c.zip
Merge pull request #6415 from vrothberg/systemd-new-pod
podman-generate-systemd --new for pods
Diffstat (limited to 'libpod/runtime_pod_infra_linux.go')
-rw-r--r--libpod/runtime_pod_infra_linux.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/libpod/runtime_pod_infra_linux.go b/libpod/runtime_pod_infra_linux.go
index 06a7b3936..a0dee3aa1 100644
--- a/libpod/runtime_pod_infra_linux.go
+++ b/libpod/runtime_pod_infra_linux.go
@@ -130,6 +130,9 @@ func (r *Runtime) makeInfraContainer(ctx context.Context, p *Pod, imgName, rawIm
options = append(options, WithRootFSFromImage(imgID, imgName, rawImageName))
options = append(options, WithName(containerName))
options = append(options, withIsInfra())
+ if len(p.config.InfraContainer.ConmonPidFile) > 0 {
+ options = append(options, WithConmonPidFile(p.config.InfraContainer.ConmonPidFile))
+ }
return r.newContainer(ctx, g.Config, options...)
}