diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-16 12:44:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-16 12:44:10 +0100 |
| commit | d8683219d2ac5fd9a0aa271ef9d94cebe0c2adc0 (patch) | |
| tree | d0546c3da5d6aad67d3543cb4d6fc4faa6620735 /libpod/oci.go | |
| parent | b3abe2c28941143d520e03c581b0ee3c3fafc087 (diff) | |
| parent | 3b37101c6e3679399a5ed05bb2e109df0e0032e8 (diff) | |
| download | podman-d8683219d2ac5fd9a0aa271ef9d94cebe0c2adc0.tar.gz podman-d8683219d2ac5fd9a0aa271ef9d94cebe0c2adc0.tar.bz2 podman-d8683219d2ac5fd9a0aa271ef9d94cebe0c2adc0.zip | |
Merge pull request #2079 from giuseppe/multiple-runtimes
oci: allow to define multiple OCI runtimes
Diffstat (limited to 'libpod/oci.go')
| -rw-r--r-- | libpod/oci.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libpod/oci.go b/libpod/oci.go index 7a908db2e..4092657f8 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -75,10 +75,10 @@ type syncInfo struct { } // Make a new OCI runtime with provided options -func newOCIRuntime(name string, path string, conmonPath string, conmonEnv []string, cgroupManager string, tmpDir string, logSizeMax int64, noPivotRoot bool, reservePorts bool) (*OCIRuntime, error) { +func newOCIRuntime(oruntime OCIRuntimePath, conmonPath string, conmonEnv []string, cgroupManager string, tmpDir string, logSizeMax int64, noPivotRoot bool, reservePorts bool) (*OCIRuntime, error) { runtime := new(OCIRuntime) - runtime.name = name - runtime.path = path + runtime.name = oruntime.Name + runtime.path = oruntime.Paths[0] runtime.conmonPath = conmonPath runtime.conmonEnv = conmonEnv runtime.cgroupManager = cgroupManager |