diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-25 17:05:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-25 17:05:26 -0400 |
| commit | 6a541f6802bf1adf3c78648d4d933ea8d6652ed2 (patch) | |
| tree | 16e6250c0dd9df1edae2bf22bc75bcbee36d4583 /pkg/systemd | |
| parent | 48ce67fb5630e67f17f2460b30a0f9cddc21ab8f (diff) | |
| parent | f7b16d0173a363c322b9bc0ded590d410339626f (diff) | |
| download | podman-6a541f6802bf1adf3c78648d4d933ea8d6652ed2.tar.gz podman-6a541f6802bf1adf3c78648d4d933ea8d6652ed2.tar.bz2 podman-6a541f6802bf1adf3c78648d4d933ea8d6652ed2.zip | |
Merge pull request #6780 from mheon/even_more_201_backports
Even more v2.0.1 backports
Diffstat (limited to 'pkg/systemd')
| -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 |