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

feature #1112: Prolog uses the new locations

Browse Source
This commit is contained in:
Ruben S. Montero 2012-02-26 22:08:50 +01:00
parent 31be0a2000
commit 8e3da6cb22
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/tm/TransferManager.cc
View File

@ -301,13 +301,11 @@ void TransferManager::prolog_action(int vid)
}
//MKSWAP tm_mad size hostname:remote_system_dir/disk.i
/*
xfr << "MKSWAP "
<< tm_mad << " "
<< size << " "
<< vm->get_hostname() << ":"
<< vm->get_remote_dir() << "/disk." << i << endl;
*/
<< vm->get_remote_system_dir() << "/disk." << i << endl;
}
else if ( type == "FS" )
{
@ -324,11 +322,12 @@ void TransferManager::prolog_action(int vid)
continue;
}
//MKIMAGE tm_mad size format hostname:remote_system_dir/disk.i
/*
xfr << "MKIMAGE " << size << " " << format << " "
<< vm->get_hostname() << ":" << vm->get_remote_dir()
<< "/disk." << i << endl;
*/
xfr << "MKIMAGE "
<< tm_mad << " "
<< size << " "
<< format << " "
<< vm->get_hostname() << ":"
<< vm->get_remote_system_dir() << "/disk." << i << endl;
}
else
{
@ -358,6 +357,8 @@ void TransferManager::prolog_action(int vid)
xfr << "LN ";
}
xfr << tm_mad << " ";
// -----------------------------------------------------------------
// Get the disk image, and set source URL
// -----------------------------------------------------------------
@ -376,10 +377,9 @@ void TransferManager::prolog_action(int vid)
{
xfr << source << " ";
}
/*
xfr << vm->get_hostname() << ":" << vm->get_remote_dir()
<< "/disk." << i;
*/
xfr << vm->get_hostname() << ":"
<< vm->get_remote_system_dir() << "/disk." << i;
if (!size.empty()) //Add size for dev based disks
{
@ -404,7 +404,6 @@ void TransferManager::prolog_action(int vid)
if ( context_result )
{
//CONTEXT files hostname:remote_system_dir/disk.i
/*
xfr << "CONTEXT " << vm->get_context_file() << " ";
if (!files.empty())
@ -412,9 +411,9 @@ void TransferManager::prolog_action(int vid)
xfr << files << " ";
}
xfr << vm->get_hostname() << ":" << vm->get_remote_dir()
<< "/disk." << num << endl;
*/
xfr << vm->get_hostname() << ":"
<< vm->get_remote_system_dir() << "/disk." << num
<< endl;
}
xfr.close();