From 00764fccf4471d9bb588d9ccc1bee8652615a436 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Tue, 31 Mar 2015 10:25:32 +0200 Subject: [PATCH] bug #3722: do not use modules to check for kvm (cherry picked from commit 08b3b8c01ad4e73622214e9161ef6106e7d00954) --- src/vnm_mad/remotes/lib/vnm_driver.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vnm_mad/remotes/lib/vnm_driver.rb b/src/vnm_mad/remotes/lib/vnm_driver.rb index dbc8349558..1445e66ae0 100644 --- a/src/vnm_mad/remotes/lib/vnm_driver.rb +++ b/src/vnm_mad/remotes/lib/vnm_driver.rb @@ -81,12 +81,12 @@ module VNMMAD # Return a string for the hypervisor # @return [String] "kvm", "xen" or nil def detect_hypervisor - lsmod = `#{VNMNetwork::COMMANDS[:lsmod]}` xen_file = "/proc/xen/capabilities" + kvm_dir = "/sys/class/misc/kvm" if File.exists?(xen_file) "xen" - elsif lsmod.match(/kvm/) + elsif File.exists?(kvm_dir) "kvm" else nil