diff options
| author | Vincent Batts <vbatts@hashbangbash.com> | 2018-11-02 10:18:28 -0400 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-01-14 10:03:40 +0100 |
| commit | 650cf122e1b33f4d8f4426ee1cc1a4bf00c14798 (patch) | |
| tree | f85f464a253c05a889854ad54633358939cf48ae /libpod/oci.go | |
| parent | 140ae25c4d0c7ba89a0bb7ae16f81f90d20be535 (diff) | |
| download | podman-650cf122e1b33f4d8f4426ee1cc1a4bf00c14798.tar.gz podman-650cf122e1b33f4d8f4426ee1cc1a4bf00c14798.tar.bz2 podman-650cf122e1b33f4d8f4426ee1cc1a4bf00c14798.zip | |
libpod: allow multiple oci runtimes
This deprecates the libpod.conf variable of `runtime_path=`, and now has
`runtimes=`, like a map for naming the runtime, preparing for a
`--runtime` flag to `podman run` (i.e. runc, kata, etc.)
Reference: https://github.com/containers/libpod/issues/1750
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
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 |