summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-04-15 13:54:09 -0700
committerGitHub <noreply@github.com>2020-04-15 13:54:09 -0700
commit3500a8bc39bfc625444fb343a239d607604f06d6 (patch)
treea2febeb1a83b796c917a9e7317a763b74b393296 /pkg
parent6e9622aa987bba37026fe628bffb5958d4cf64cb (diff)
parentbbc0c4a97374c88c811e49191b5554a6a6516329 (diff)
downloadpodman-3500a8bc39bfc625444fb343a239d607604f06d6.tar.gz
podman-3500a8bc39bfc625444fb343a239d607604f06d6.tar.bz2
podman-3500a8bc39bfc625444fb343a239d607604f06d6.zip
Merge pull request #5830 from baude/v2runtime
podmanv2 fix runtime assignment
Diffstat (limited to 'pkg')
-rw-r--r--pkg/domain/infra/runtime_libpod.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/domain/infra/runtime_libpod.go b/pkg/domain/infra/runtime_libpod.go
index 9cf374e2e..6b0ac4852 100644
--- a/pkg/domain/infra/runtime_libpod.go
+++ b/pkg/domain/infra/runtime_libpod.go
@@ -160,7 +160,7 @@ func getRuntime(ctx context.Context, fs *flag.FlagSet, opts *engineOpts) (*libpo
}
if fs.Changed("runtime") {
- options = append(options, libpod.WithOCIRuntime(cfg.RuntimePath))
+ options = append(options, libpod.WithOCIRuntime(cfg.Engine.OCIRuntime))
}
if fs.Changed("conmon") {