diff options
| author | Adrian Reber <areber@redhat.com> | 2018-11-21 13:09:17 +0000 |
|---|---|---|
| committer | Adrian Reber <adrian@lisas.de> | 2018-11-28 08:00:37 +0100 |
| commit | 0592558289c354447d28903910f4165ac5acd71a (patch) | |
| tree | a8034111fc7d73aca2509e26f0ce5aa1223b88cf /libpod/container_internal_linux.go | |
| parent | 6df7409cb5a41c710164c42ed35e33b28f3f7214 (diff) | |
| download | podman-0592558289c354447d28903910f4165ac5acd71a.tar.gz podman-0592558289c354447d28903910f4165ac5acd71a.tar.bz2 podman-0592558289c354447d28903910f4165ac5acd71a.zip | |
Use also a struct to pass options to Restore()
This is basically the same change as
ff47a4c2d5485fc49f937f3ce0c4e2fd6bdb1956 (Use a struct to pass options to Checkpoint())
just for the Restore() function. It is used to pass multiple restore
options to the API and down to conmon which is used to restore
containers. This is for the upcoming changes to support checkpointing
and restoring containers with '--tcp-established'.
Signed-off-by: Adrian Reber <areber@redhat.com>
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 |