diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-22 17:00:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-22 17:00:48 +0100 |
| commit | 9f146b1b54736ec1b683e3a7381c85d10b1a66a3 (patch) | |
| tree | dd2ff39128e9aa3ba5bf67c7abc69aa59020f6b7 /pkg/systemdgen/systemdgen_test.go | |
| parent | 105a42a2a46529312205cf852fa127627f8915e3 (diff) | |
| parent | 1951ff168a63157fa2f4711fde283edfc4981ed3 (diff) | |
| download | podman-9f146b1b54736ec1b683e3a7381c85d10b1a66a3.tar.gz podman-9f146b1b54736ec1b683e3a7381c85d10b1a66a3.tar.bz2 podman-9f146b1b54736ec1b683e3a7381c85d10b1a66a3.zip | |
Merge pull request #4861 from giuseppe/add-cgroups-disabled-conmon
oci_conmon: do not create a cgroup under systemd
Diffstat (limited to 'pkg/systemdgen/systemdgen_test.go')
| -rw-r--r-- | pkg/systemdgen/systemdgen_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/systemdgen/systemdgen_test.go b/pkg/systemdgen/systemdgen_test.go index 9c6933d17..ee2429407 100644 --- a/pkg/systemdgen/systemdgen_test.go +++ b/pkg/systemdgen/systemdgen_test.go @@ -122,7 +122,7 @@ Documentation=man:podman-generate-systemd(1) [Service] Restart=always ExecStartPre=/usr/bin/rm -f /%t/%n-pid /%t/%n-cid -ExecStart=/usr/bin/podman run --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid --name jadda-jadda --hostname hello-world awesome-image:latest command arg1 ... argN +ExecStart=/usr/bin/podman run --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid --cgroups=no-conmon --name jadda-jadda --hostname hello-world awesome-image:latest command arg1 ... argN ExecStop=/usr/bin/podman stop --ignore --cidfile /%t/%n-cid -t 42 ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile /%t/%n-cid PIDFile=/%t/%n-pid |