diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-20 05:49:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-20 05:49:06 -0400 |
| commit | 21f3bdf63d6f1a9791f18294ecf53b3ced6dbb10 (patch) | |
| tree | 169417354aa870b0d911eb5b9134aba8f6876d9e /pkg/systemd/generate/pods_test.go | |
| parent | 89dbd1a916b2aeb96901402be6f3cc58373b5fe4 (diff) | |
| parent | f18d2751f69f90f65bd22d9d97bb9e288b683e10 (diff) | |
| download | podman-21f3bdf63d6f1a9791f18294ecf53b3ced6dbb10.tar.gz podman-21f3bdf63d6f1a9791f18294ecf53b3ced6dbb10.tar.bz2 podman-21f3bdf63d6f1a9791f18294ecf53b3ced6dbb10.zip | |
Merge pull request #6675 from yhchen0906/master
correct the absolute path of `rm` executable
Diffstat (limited to 'pkg/systemd/generate/pods_test.go')
| -rw-r--r-- | pkg/systemd/generate/pods_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/systemd/generate/pods_test.go b/pkg/systemd/generate/pods_test.go index e12222317..874d7204e 100644 --- a/pkg/systemd/generate/pods_test.go +++ b/pkg/systemd/generate/pods_test.go @@ -74,7 +74,7 @@ Before=container-1.service container-2.service [Service] Environment=PODMAN_SYSTEMD_UNIT=%n Restart=on-failure -ExecStartPre=/usr/bin/rm -f %t/pod-123abc.pid %t/pod-123abc.pod-id +ExecStartPre=/bin/rm -f %t/pod-123abc.pid %t/pod-123abc.pod-id ExecStartPre=/usr/bin/podman pod create --infra-conmon-pidfile %t/pod-123abc.pid --pod-id-file %t/pod-123abc.pod-id --name foo --replace ExecStart=/usr/bin/podman pod start --pod-id-file %t/pod-123abc.pod-id ExecStop=/usr/bin/podman pod stop --ignore --pod-id-file %t/pod-123abc.pod-id -t 10 |