mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-19 11:22:55 +09:00
Bug #4017: Disable disk resize for cdrom images
(cherry picked from commit 45f9bf69ab)
This commit is contained in:
1 parent
adc9183a07
commit
3e4bdea3cd
2 files changed
+17
-1
No files matched your search
@@ -426,6 +426,19 @@ int ImagePool::acquire_disk(int vm_id,
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (has_size && img->get_type() == Image::CDROM && size != img->get_size())
|
||||
{
|
||||
img->unlock();
|
||||
|
||||
imagem->release_image(vm_id, iid, false);
|
||||
|
||||
oss << "SIZE attribute is not supported for CDROM image ["
|
||||
<< img->get_oid() << "].";
|
||||
error_str = oss.str();
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (has_size && size < img->get_size())
|
||||
{
|
||||
img->unlock();
|
||||
|
||||
@@ -18,6 +18,7 @@ define(function(require){
|
||||
var Locale = require('utils/locale');
|
||||
var Config = require('sunstone-config');
|
||||
var OpenNebula = require('opennebula');
|
||||
var OpenNebulaImage = require('opennebula/image');
|
||||
var RangeSlider = require('utils/range-slider');
|
||||
|
||||
return {
|
||||
@@ -110,7 +111,9 @@ define(function(require){
|
||||
diskContext.data('original_size', sizeGB);
|
||||
|
||||
var label = disk.IMAGE ? disk.IMAGE : Locale.tr("Volatile Disk");
|
||||
var enabled = !(disk.PERSISTENT && disk.PERSISTENT.toUpperCase() == "YES");
|
||||
var enabled =
|
||||
!( (disk.PERSISTENT && disk.PERSISTENT.toUpperCase() == "YES") ||
|
||||
(disk.TYPE && OpenNebulaImage.TYPES[disk.TYPE] == OpenNebulaImage.TYPES.CDROM) );
|
||||
|
||||
RangeSlider.insert({
|
||||
'label': label,
|
||||
|
||||
Reference in new issue
Block a user