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

feature #336: Preserve SOURCE if present in the template file

Browse Source
This commit is contained in:
Ruben S. Montero 2010-09-08 13:27:00 +02:00
parent 05032061c9
commit 3e8db30a9d
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/image/Image.cc
View File

@ -156,9 +156,6 @@ int Image::insert(SqlDB *db, string& error_str)
string persistent_attr;
string dev_prefix;
ostringstream tmp_hashstream;
ostringstream tmp_sourcestream;
// ---------------------------------------------------------------------
// Check default image attributes
// ---------------------------------------------------------------------
@ -230,13 +227,20 @@ int Image::insert(SqlDB *db, string& error_str)
// ------------ SOURCE (path to store the image)--------------------
tmp_hashstream << uid << ":" << name;
get_template_attribute("SOURCE", source);
tmp_sourcestream << ImagePool::source_prefix() << "/";
tmp_sourcestream << sha1_digest(tmp_hashstream.str());
if (source.empty())
{
ostringstream tmp_hashstream;
ostringstream tmp_sourcestream;
source = tmp_sourcestream.str();
tmp_hashstream << uid << ":" << name;
tmp_sourcestream << ImagePool::source_prefix() << "/";
tmp_sourcestream << sha1_digest(tmp_hashstream.str());
source = tmp_sourcestream.str();
}
state = DISABLED;