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.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.go')
| -rw-r--r-- | pkg/systemd/generate/pods.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/systemd/generate/pods.go b/pkg/systemd/generate/pods.go index 1bd0c7bce..cb4078fac 100644 --- a/pkg/systemd/generate/pods.go +++ b/pkg/systemd/generate/pods.go @@ -293,7 +293,7 @@ func executePodTemplate(info *podInfo, options entities.GenerateSystemdOptions) startCommand = append(startCommand, podCreateArgs...) - info.ExecStartPre1 = "/usr/bin/rm -f {{.PIDFile}} {{.PodIDFile}}" + info.ExecStartPre1 = "/bin/rm -f {{.PIDFile}} {{.PodIDFile}}" info.ExecStartPre2 = strings.Join(startCommand, " ") info.ExecStart = "{{.Executable}} pod start --pod-id-file {{.PodIDFile}}" info.ExecStop = "{{.Executable}} pod stop --ignore --pod-id-file {{.PodIDFile}} {{if (ge .StopTimeout 0)}}-t {{.StopTimeout}}{{end}}" |