summaryrefslogtreecommitdiff
path: root/pkg/systemd/generate/containers.go
diff options
context:
space:
mode:
authorPaul Holzinger <paul.holzinger@web.de>2021-02-15 15:46:00 +0100
committerPaul Holzinger <paul.holzinger@web.de>2021-02-16 09:51:09 +0100
commitbf083c185d766fb9eb79c08b2d831da0fa2abafd (patch)
treebff7197bd3fd501d49c9baa3ec605b0f7b06caae /pkg/systemd/generate/containers.go
parentdf8ba7f4a92750bfb173b5486a663d1735d70b2d (diff)
downloadpodman-bf083c185d766fb9eb79c08b2d831da0fa2abafd.tar.gz
podman-bf083c185d766fb9eb79c08b2d831da0fa2abafd.tar.bz2
podman-bf083c185d766fb9eb79c08b2d831da0fa2abafd.zip
Fix broken podman generate systemd --new with pods
The unit generation accidentally escaped the %t in the pod id file path. This is a regression caused by #9178. This was not caught by the tests because the test itself was wrong. It used a full path instead of the systemd variable %t like the actual code does. Fixes #9373 Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
Diffstat (limited to 'pkg/systemd/generate/containers.go')
-rw-r--r--pkg/systemd/generate/containers.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/systemd/generate/containers.go b/pkg/systemd/generate/containers.go
index abe159812..acee7be65 100644
--- a/pkg/systemd/generate/containers.go
+++ b/pkg/systemd/generate/containers.go
@@ -68,7 +68,7 @@ type containerInfo struct {
// If not nil, the container is part of the pod. We can use the
// podInfo to extract the relevant data.
- pod *podInfo
+ Pod *podInfo
}
const containerTemplate = headerTemplate + `
@@ -215,8 +215,8 @@ func executeContainerTemplate(info *containerInfo, options entities.GenerateSyst
)
// If the container is in a pod, make sure that the
// --pod-id-file is set correctly.
- if info.pod != nil {
- podFlags := []string{"--pod-id-file", info.pod.PodIDFile}
+ if info.Pod != nil {
+ podFlags := []string{"--pod-id-file", "{{{{.Pod.PodIDFile}}}}"}
startCommand = append(startCommand, podFlags...)
info.CreateCommand = filterPodFlags(info.CreateCommand)
}