diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-11-28 07:00:24 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-28 07:00:24 -0800 |
| commit | effd63d6d5c2541f09745261a1e9205fa531e526 (patch) | |
| tree | 2f7a3f956fdc1dfcb0743da87fbec4abb02662a6 /libpod/container_internal_linux.go | |
| parent | d346996e1512ef6efb3800d6cb762d0409d12459 (diff) | |
| parent | d3cde7cefe4eed4b8cb0723211c19352c55f3dcf (diff) | |
| download | podman-effd63d6d5c2541f09745261a1e9205fa531e526.tar.gz podman-effd63d6d5c2541f09745261a1e9205fa531e526.tar.bz2 podman-effd63d6d5c2541f09745261a1e9205fa531e526.zip | |
Merge pull request #1848 from adrianreber/master
Add tcp-established to checkpoint/restore
Diffstat (limited to 'libpod/container_internal_linux.go')
| -rw-r--r-- | libpod/container_internal_linux.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index ffb82cc94..99f8652df 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -514,7 +514,7 @@ func (c *Container) checkpoint(ctx context.Context, options ContainerCheckpointO return c.save() } -func (c *Container) restore(ctx context.Context, keep bool) (err error) { +func (c *Container) restore(ctx context.Context, options ContainerCheckpointOptions) (err error) { if !criu.CheckForCriu() { return errors.Errorf("restoring a container requires at least CRIU %d", criu.MinCriuVersion) @@ -602,7 +602,7 @@ func (c *Container) restore(ctx context.Context, keep bool) (err error) { // Cleanup for a working restore. c.removeConmonFiles() - if err := c.runtime.ociRuntime.createContainer(c, c.config.CgroupParent, true); err != nil { + if err := c.runtime.ociRuntime.createContainer(c, c.config.CgroupParent, &options); err != nil { return err } @@ -610,7 +610,7 @@ func (c *Container) restore(ctx context.Context, keep bool) (err error) { c.state.State = ContainerStateRunning - if !keep { + if !options.Keep { // Delete all checkpoint related files. At this point, in theory, all files // should exist. Still ignoring errors for now as the container should be // restored and running. Not erroring out just because some cleanup operation |