From d7e05a46cf56cc8211680f897e53d027b57c39ae Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Mon, 9 Jan 2012 09:37:51 +0100 Subject: [PATCH] Bug #1046: detection of hypervisor fails for XEN --- src/vnm_mad/remotes/OpenNebulaNetwork.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/vnm_mad/remotes/OpenNebulaNetwork.rb b/src/vnm_mad/remotes/OpenNebulaNetwork.rb index 47b3a2c57c..bcd0212a94 100644 --- a/src/vnm_mad/remotes/OpenNebulaNetwork.rb +++ b/src/vnm_mad/remotes/OpenNebulaNetwork.rb @@ -116,13 +116,16 @@ class OpenNebulaNetwork end def detect_hypervisor - uname_a = `uname -a` - lsmod = `#{COMMANDS[:lsmod]}` + lsmod = `#{COMMANDS[:lsmod]}` + xen_file = "/proc/xen/capabilities" + xen_content = "control_d" - if uname_a.match(/xen/i) + if File.readable?(xen_file) and File.read(xen_file).strip == xen_content "xen" elsif lsmod.match(/kvm/) "kvm" + else + nil end end