diff options
| author | Paul Holzinger <paul.holzinger@web.de> | 2021-02-15 15:46:00 +0100 |
|---|---|---|
| committer | Paul Holzinger <paul.holzinger@web.de> | 2021-02-16 09:51:09 +0100 |
| commit | bf083c185d766fb9eb79c08b2d831da0fa2abafd (patch) | |
| tree | bff7197bd3fd501d49c9baa3ec605b0f7b06caae /pkg/systemd/generate/containers_test.go | |
| parent | df8ba7f4a92750bfb173b5486a663d1735d70b2d (diff) | |
| download | podman-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_test.go')
| -rw-r--r-- | pkg/systemd/generate/containers_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/systemd/generate/containers_test.go b/pkg/systemd/generate/containers_test.go index be14e4c28..dad14ece9 100644 --- a/pkg/systemd/generate/containers_test.go +++ b/pkg/systemd/generate/containers_test.go @@ -170,7 +170,7 @@ Environment=PODMAN_SYSTEMD_UNIT=%n Restart=always TimeoutStopSec=70 ExecStartPre=/bin/rm -f %t/jadda-jadda.pid %t/jadda-jadda.ctr-id -ExecStart=/usr/bin/podman run --conmon-pidfile %t/jadda-jadda.pid --cidfile %t/jadda-jadda.ctr-id --cgroups=no-conmon --pod-id-file /tmp/pod-foobar.pod-id-file --replace -d --name jadda-jadda --hostname hello-world awesome-image:latest command arg1 ... argN +ExecStart=/usr/bin/podman run --conmon-pidfile %t/jadda-jadda.pid --cidfile %t/jadda-jadda.ctr-id --cgroups=no-conmon --pod-id-file %t/pod-foobar.pod-id-file --replace -d --name jadda-jadda --hostname hello-world awesome-image:latest command arg1 ... argN ExecStop=/usr/bin/podman stop --ignore --cidfile %t/jadda-jadda.ctr-id -t 10 ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/jadda-jadda.ctr-id PIDFile=%t/jadda-jadda.pid @@ -487,8 +487,8 @@ WantedBy=multi-user.target default.target PodmanVersion: "CI", CreateCommand: []string{"I'll get stripped", "run", "-d", "--name", "jadda-jadda", "--hostname", "hello-world", "awesome-image:latest", "command", "arg1", "...", "argN"}, EnvVariable: EnvVariable, - pod: &podInfo{ - PodIDFile: "/tmp/pod-foobar.pod-id-file", + Pod: &podInfo{ + PodIDFile: "%t/pod-foobar.pod-id-file", }, }, goodNameNewWithPodFile, |