shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-11 05:17:41 +03:00
Code Releases Wiki Activity

Merge branch 'master' of git.opennebula.org:one

Browse Source
This commit is contained in:
Tino Vazquez 2012-01-12 18:36:57 +01:00
commit a709c1a306
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/vmm_mad/exec/one_vmm_exec.rb
View File

@ -159,7 +159,7 @@ class VmmAction
# Roll back steps, store failed info and break steps # Roll back steps, store failed info and break steps
if DriverExecHelper.failed?(result) if DriverExecHelper.failed?(result)
execute_steps(@data[:fail_actions]) if @data[:fail_actions] execute_steps(step[:fail_actions]) if step[:fail_actions]
@data[:failed_info] = info @data[:failed_info] = info
@vmm.log(@id, @vmm.log(@id,

3
src/vnm_mad/remotes/OpenNebulaNetwork.rb
View File

@ -118,9 +118,8 @@ class OpenNebulaNetwork
def detect_hypervisor def detect_hypervisor
lsmod = `#{COMMANDS[:lsmod]}` lsmod = `#{COMMANDS[:lsmod]}`
xen_file = "/proc/xen/capabilities" 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" "xen"
elsif lsmod.match(/kvm/) elsif lsmod.match(/kvm/)
"kvm" "kvm"