diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-22 22:46:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-22 22:46:18 +0200 |
| commit | a12a2312ac5c6c485eaa1d45e4b7e29d6cc4a9ff (patch) | |
| tree | 2fe83dbecabff2df6aabfe7204418fd6fa05919e /libpod/container_internal_linux.go | |
| parent | cf9efa90e5dcf89e10408eae5229c4ce904d9fc7 (diff) | |
| parent | 53e1ede46b030ad2aeecbdd7b2a385b60500ac4c (diff) | |
| download | podman-a12a2312ac5c6c485eaa1d45e4b7e29d6cc4a9ff.tar.gz podman-a12a2312ac5c6c485eaa1d45e4b7e29d6cc4a9ff.tar.bz2 podman-a12a2312ac5c6c485eaa1d45e4b7e29d6cc4a9ff.zip | |
Merge pull request #3143 from haircommander/conmon-exec
use conmon for exec
Diffstat (limited to 'libpod/container_internal_linux.go')
| -rw-r--r-- | libpod/container_internal_linux.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index 3dfd4c9e9..6e775cd28 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -834,7 +834,7 @@ func (c *Container) restore(ctx context.Context, options ContainerCheckpointOpti } } - if err := c.ociRuntime.createContainer(c, c.config.CgroupParent, &options); err != nil { + if err := c.ociRuntime.createContainer(c, &options); err != nil { return err } |