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

M #: fix FORMAT for SWAP images (#364)

Browse Source
This commit is contained in:
Christian González 2020-10-26 19:08:24 +01:00 committed by GitHub
parent aa0f091da0
commit ef4e528172
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/datastore/Datastore.cc
View File

@ -188,16 +188,24 @@ void Datastore::disk_attribute(
{
string driver = get_ds_driver();
if (!driver.empty()) /* DRIVER in TM_MAD_CONF or DS Template */
if (disk->vector_value("TYPE") == "FS") /* Volatile Datablock */
{
disk->replace("DRIVER", driver);
disk->replace("FORMAT", driver);
if (!driver.empty()) /* DRIVER in TM_MAD_CONF or DS Template */
{
disk->replace("DRIVER", driver);
disk->replace("FORMAT", driver);
}
else if (!disk->vector_value("FORMAT").empty()) /* DRIVER in DISK */
{
disk->replace("DRIVER", disk->vector_value("FORMAT"));
}
else /* Default for volatiles */
{
disk->replace("DRIVER", "raw");
disk->replace("FORMAT", "raw");
}
}
else if (!disk->vector_value("FORMAT").empty()) /* DRIVER in DISK */
{
disk->replace("DRIVER", disk->vector_value("FORMAT"));
}
else /* Default for volatiles */
else /* SWAP */
{
disk->replace("DRIVER", "raw");
disk->replace("FORMAT", "raw");