summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@pm.me>2019-06-20 16:19:49 -0400
committerMatthew Heon <matthew.heon@pm.me>2019-06-20 16:19:49 -0400
commit2ee24046838087c335af7c8bf8ae39ba129cd799 (patch)
tree5e6e1c7482eaf1004f19d8f08bf36f53fa0fbc95
parentdf43bfe53dfa2ea6cdf6c37ba567894340799416 (diff)
downloadpodman-2ee24046838087c335af7c8bf8ae39ba129cd799.tar.gz
podman-2ee24046838087c335af7c8bf8ae39ba129cd799.tar.bz2
podman-2ee24046838087c335af7c8bf8ae39ba129cd799.zip
Properly initialize container OCI runtime
Use name of the default runtime, instead of the OCIRuntime config option, which may include a full path. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
-rw-r--r--libpod/runtime_ctr.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go
index 0a19344b5..271d4160d 100644
--- a/libpod/runtime_ctr.go
+++ b/libpod/runtime_ctr.go
@@ -94,7 +94,7 @@ func (r *Runtime) initContainerVariables(rSpec *spec.Spec, config *ContainerConf
ctr.config.StopTimeout = CtrRemoveTimeout
- ctr.config.OCIRuntime = r.config.OCIRuntime
+ ctr.config.OCIRuntime = r.defaultOCIRuntime.name
// Set namespace based on current runtime namespace
// Do so before options run so they can override it