diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-04 12:34:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-04 12:34:49 -0700 |
| commit | 06a959f74ab4f23d5a789d03de4b2b73a3d53dc6 (patch) | |
| tree | 42e0437cd91aae4b53cd769401d7becd2309feb6 /libpod/oci_linux.go | |
| parent | 3c31e176c7dfce3c86a45ff4750f740a5f8f9321 (diff) | |
| parent | dc987af0b0146ec5fd2026ca8db403806c3425df (diff) | |
| download | podman-06a959f74ab4f23d5a789d03de4b2b73a3d53dc6.tar.gz podman-06a959f74ab4f23d5a789d03de4b2b73a3d53dc6.tar.bz2 podman-06a959f74ab4f23d5a789d03de4b2b73a3d53dc6.zip | |
Merge pull request #469 from adrianreber/master
Add support to checkpoint/restore containers
Diffstat (limited to 'libpod/oci_linux.go')
| -rw-r--r-- | libpod/oci_linux.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libpod/oci_linux.go b/libpod/oci_linux.go index 210ba57d1..0447670b3 100644 --- a/libpod/oci_linux.go +++ b/libpod/oci_linux.go @@ -63,10 +63,10 @@ func newPipe() (parent *os.File, child *os.File, err error) { // CreateContainer creates a container in the OCI runtime // TODO terminal support for container // Presently just ignoring conmon opts related to it -func (r *OCIRuntime) createContainer(ctr *Container, cgroupParent string) (err error) { +func (r *OCIRuntime) createContainer(ctr *Container, cgroupParent string, restoreContainer bool) (err error) { if ctr.state.UserNSRoot == "" { // no need of an intermediate mount ns - return r.createOCIContainer(ctr, cgroupParent) + return r.createOCIContainer(ctr, cgroupParent, restoreContainer) } var wg sync.WaitGroup wg.Add(1) @@ -103,7 +103,7 @@ func (r *OCIRuntime) createContainer(ctr *Container, cgroupParent string) (err e if err != nil { return } - err = r.createOCIContainer(ctr, cgroupParent) + err = r.createOCIContainer(ctr, cgroupParent, restoreContainer) }() wg.Wait() |