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/info.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/info.go')
| -rw-r--r-- | libpod/info.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libpod/info.go b/libpod/info.go index a98f93897..191ce6810 100644 --- a/libpod/info.go +++ b/libpod/info.go @@ -4,7 +4,6 @@ import ( "bufio" "bytes" "fmt" - "github.com/containers/buildah" "io/ioutil" "os" "runtime" @@ -12,6 +11,7 @@ import ( "strings" "time" + "github.com/containers/buildah" "github.com/containers/libpod/pkg/rootless" "github.com/containers/libpod/pkg/util" "github.com/containers/libpod/utils" @@ -184,12 +184,12 @@ func (r *Runtime) GetConmonVersion() (string, error) { // GetOCIRuntimePath returns the path to the OCI Runtime Path the runtime is using func (r *Runtime) GetOCIRuntimePath() string { - return r.ociRuntimePath + return r.ociRuntimePath.Paths[0] } // GetOCIRuntimeVersion returns a string representation of the oci runtimes version func (r *Runtime) GetOCIRuntimeVersion() (string, error) { - output, err := utils.ExecCmd(r.ociRuntimePath, "--version") + output, err := utils.ExecCmd(r.ociRuntimePath.Paths[0], "--version") if err != nil { return "", err } |