diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2020-01-14 15:17:16 +0100 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2020-01-16 18:59:09 +0100 |
| commit | 70236f56f9e8f2044e94800de7be3925f52d6c83 (patch) | |
| tree | 4581095813c7e03b6dc006a7a626a7464144c882 /pkg/systemdgen/systemdgen_test.go | |
| parent | ba0a6f34e349bfb5cf70cb2062522e6af1b9578c (diff) | |
| download | podman-70236f56f9e8f2044e94800de7be3925f52d6c83.tar.gz podman-70236f56f9e8f2044e94800de7be3925f52d6c83.tar.bz2 podman-70236f56f9e8f2044e94800de7be3925f52d6c83.zip | |
systemdgen: specify --cgroups=disabled-conmon for --new
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
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 |