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/containers.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/containers.go')
| -rw-r--r-- | pkg/systemd/generate/containers.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/systemd/generate/containers.go b/pkg/systemd/generate/containers.go index 16ff0b821..bf6cb81b8 100644 --- a/pkg/systemd/generate/containers.go +++ b/pkg/systemd/generate/containers.go @@ -244,7 +244,7 @@ func executeContainerTemplate(info *containerInfo, options entities.GenerateSyst } startCommand = append(startCommand, info.CreateCommand[index:]...) - info.ExecStartPre = "/usr/bin/rm -f {{.PIDFile}} {{.ContainerIDFile}}" + info.ExecStartPre = "/bin/rm -f {{.PIDFile}} {{.ContainerIDFile}}" info.ExecStart = strings.Join(startCommand, " ") info.ExecStop = "{{.Executable}} stop --ignore --cidfile {{.ContainerIDFile}} {{if (ge .StopTimeout 0)}}-t {{.StopTimeout}}{{end}}" info.ExecStopPost = "{{.Executable}} rm --ignore -f --cidfile {{.ContainerIDFile}}" |