diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-25 09:46:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-25 09:46:10 -0400 |
| commit | c036eef44d5fe07b754968ca1eef57034350c53b (patch) | |
| tree | b9c2ffe0f14b26899f8fbe8ee160ad8ee112f5e7 | |
| parent | f8036c548c0a6d34cc063949cf5f9add22409d9d (diff) | |
| parent | 4daf82bd96bd34aedcfa576aa97e3c4793267203 (diff) | |
| download | podman-c036eef44d5fe07b754968ca1eef57034350c53b.tar.gz podman-c036eef44d5fe07b754968ca1eef57034350c53b.tar.bz2 podman-c036eef44d5fe07b754968ca1eef57034350c53b.zip | |
Merge pull request #6771 from vrothberg/fix-6770
systemd generate: allow manual restart of container units in pods
| -rw-r--r-- | pkg/systemd/generate/containers.go | 2 | ||||
| -rw-r--r-- | pkg/systemd/generate/containers_test.go | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/pkg/systemd/generate/containers.go b/pkg/systemd/generate/containers.go index bf6cb81b8..333f8ef88 100644 --- a/pkg/systemd/generate/containers.go +++ b/pkg/systemd/generate/containers.go @@ -69,8 +69,6 @@ type containerInfo struct { const containerTemplate = headerTemplate + ` {{- if .BoundToServices}} -RefuseManualStart=yes -RefuseManualStop=yes BindsTo={{- range $index, $value := .BoundToServices -}}{{if $index}} {{end}}{{ $value }}.service{{end}} After={{- range $index, $value := .BoundToServices -}}{{if $index}} {{end}}{{ $value }}.service{{end}} {{- end}} diff --git a/pkg/systemd/generate/containers_test.go b/pkg/systemd/generate/containers_test.go index 80f0996a1..e108251ea 100644 --- a/pkg/systemd/generate/containers_test.go +++ b/pkg/systemd/generate/containers_test.go @@ -88,8 +88,6 @@ Description=Podman container-foobar.service Documentation=man:podman-generate-systemd(1) Wants=network.target After=network-online.target -RefuseManualStart=yes -RefuseManualStop=yes BindsTo=a.service b.service c.service pod.service After=a.service b.service c.service pod.service |