shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-20 10:50:08 +03:00
Code Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ruben S. Montero 2011-05-12 16:42:22 +02:00
commit 3ba628af76
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -9,7 +9,7 @@ distributed data center infrastructures.
Complete documentation can be found at
http://opennebula.org/documentation:rel2.0
http://opennebula.org/documentation:rel2.4
## INSTALLATION
@ -111,7 +111,7 @@ where **install_options** can be one or more of:
## CONFIGURATION
Information on how to configure OpenNebula is located at http://opennebula.org/documentation:rel2.0
Information on how to configure OpenNebula is located at http://opennebula.org/documentation:rel2.4
## CONTACT

10
src/vmm/LibVirtDriverVMware.cc
View File

@ -166,11 +166,6 @@ int LibVirtDriver::deployment_description_vmware(
get_default("DISK","DRIVER",default_driver);
if (default_driver.empty())
{
default_driver = "raw";
}
num = vm->get_template_attribute("DISK",attrs);
if (num!=0)
@ -252,7 +247,10 @@ int LibVirtDriver::deployment_description_vmware(
}
else
{
file << default_driver << "'/>" << endl;
if (!default_driver.empty())
{
file << default_driver << "'/>" << endl;
}
}
if (readonly)