diff options
| author | Stuart Shelton <stuart@shelton.me> | 2021-01-13 00:56:05 +0000 |
|---|---|---|
| committer | Stuart Shelton <stuart@shelton.me> | 2021-01-13 00:56:05 +0000 |
| commit | a2367705be776d4e2b2f5ee0563c56e27ddcef8f (patch) | |
| tree | fbd383b6633be591141852a0083d6c91221e9b3d /pkg | |
| parent | a6af56f5b45b3014c1e548d8c84e23e7cb341f5d (diff) | |
| parent | f52a9eeeea75fe84fceb6aa347888d61a5cecd59 (diff) | |
| download | podman-a2367705be776d4e2b2f5ee0563c56e27ddcef8f.tar.gz podman-a2367705be776d4e2b2f5ee0563c56e27ddcef8f.tar.bz2 podman-a2367705be776d4e2b2f5ee0563c56e27ddcef8f.zip | |
Merge branch 'master' into feature/issue-8945
Signed-off-by: Stuart Shelton <stuart@shelton.me>
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/systemd/generate/pods_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/systemd/generate/pods_test.go b/pkg/systemd/generate/pods_test.go index c0d98df45..1c6330160 100644 --- a/pkg/systemd/generate/pods_test.go +++ b/pkg/systemd/generate/pods_test.go @@ -172,7 +172,7 @@ WantedBy=multi-user.target default.target ServiceName: "pod-123abc", InfraNameOrID: "jadda-jadda-infra", RestartPolicy: "always", - PIDFile: "/var/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid", + PIDFile: "/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid", StopTimeout: 42, PodmanVersion: "CI", RequiredServices: []string{"container-1", "container-2"}, @@ -204,7 +204,7 @@ WantedBy=multi-user.target default.target ServiceName: "pod-123abc", InfraNameOrID: "jadda-jadda-infra", RestartPolicy: "on-failure", - PIDFile: "/var/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid", + PIDFile: "/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid", StopTimeout: 10, PodmanVersion: "CI", RequiredServices: []string{"container-1", "container-2"}, @@ -220,7 +220,7 @@ WantedBy=multi-user.target default.target ServiceName: "pod-123abc", InfraNameOrID: "jadda-jadda-infra", RestartPolicy: "on-failure", - PIDFile: "/var/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid", + PIDFile: "/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401/userdata/conmon.pid", StopTimeout: 10, PodmanVersion: "CI", RequiredServices: []string{"container-1", "container-2"}, |