From 3ec5aa31557a5a670c0b5e45f01515fcbad9cc8e Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Thu, 12 Jan 2012 18:34:52 +0100 Subject: [PATCH] Bug #1046: Fix detection of hypervisor. A regular user can't read /proc/xen/capabilities --- src/vnm_mad/remotes/OpenNebulaNetwork.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/vnm_mad/remotes/OpenNebulaNetwork.rb b/src/vnm_mad/remotes/OpenNebulaNetwork.rb index 621789e6b7..349abcd8d7 100644 --- a/src/vnm_mad/remotes/OpenNebulaNetwork.rb +++ b/src/vnm_mad/remotes/OpenNebulaNetwork.rb @@ -118,9 +118,8 @@ class OpenNebulaNetwork def detect_hypervisor lsmod = `#{COMMANDS[:lsmod]}` xen_file = "/proc/xen/capabilities" - xen_content = "control_d" - if File.readable?(xen_file) and File.read(xen_file).strip == xen_content + if File.exists?(xen_file) "xen" elsif lsmod.match(/kvm/) "kvm"