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

README.md

@@ -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

src/vmm/LibVirtDriverVMware.cc

@@ -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)