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/info.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/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 } |