diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-03-04 14:54:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-04 14:54:53 -0500 |
| commit | a26b15265e6361647a99876ca698986b25296179 (patch) | |
| tree | 93ca389b07a569b8e196682471b8365c41eeba56 /libpod | |
| parent | e65bcc166c3bc7e039ff0909c2cac919ce0122ad (diff) | |
| parent | 252aec1c9ae7e7ed01a4b72cf208e3c0130eb7e7 (diff) | |
| download | podman-a26b15265e6361647a99876ca698986b25296179.tar.gz podman-a26b15265e6361647a99876ca698986b25296179.tar.bz2 podman-a26b15265e6361647a99876ca698986b25296179.zip | |
Merge pull request #9598 from rhatdan/kvm
Check for supportsKVM based on basename of the runtime
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/oci_conmon_linux.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index 492bc807a..ef5f6fb0c 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -113,9 +113,11 @@ func newConmonOCIRuntime(name string, paths []string, conmonPath string, runtime // TODO: probe OCI runtime for feature and enable automatically if // available. - runtime.supportsJSON = supportsJSON[name] - runtime.supportsNoCgroups = supportsNoCgroups[name] - runtime.supportsKVM = supportsKVM[name] + + base := filepath.Base(name) + runtime.supportsJSON = supportsJSON[base] + runtime.supportsNoCgroups = supportsNoCgroups[base] + runtime.supportsKVM = supportsKVM[base] foundPath := false for _, path := range paths { |