etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pass down iso, not matter is bootable or not

This commit is contained in:
Edison Su 2011-01-20 04:12:44 -05:00
parent bc62817890
commit 1bcbd983f1
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -2145,7 +2145,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
if (vo.getIsoId() != null) {
template = _templateDao.findById(vo.getIsoId());
}
if (template != null && template.getFormat() == ImageFormat.ISO && template.isBootable()) {
if (template != null && template.getFormat() == ImageFormat.ISO) {
String isoPath = null;
Pair<String, String> isoPathPair = _storageMgr.getAbsoluteIsoPath(template.getId(), vo.getDataCenterId());
if (isoPathPair == null) {
@ -2154,10 +2154,15 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
} else {
isoPath = isoPathPair.first();
}
profile.setBootLoaderType(BootloaderType.CD);
if (template.isBootable())
profile.setBootLoaderType(BootloaderType.CD);
GuestOSVO guestOS = _guestOSDao.findById(template.getGuestOSId());
String displayName = null;
if (guestOS != null) {
displayName = guestOS.getDisplayName();
}
VolumeTO iso = new VolumeTO(profile.getId(), Volume.VolumeType.ISO, StorageResourceType.STORAGE_POOL, StoragePoolType.ISO, null, template.getName(), null, isoPath,
0, null, guestOS.getDisplayName());
0, null, displayName);
iso.setDeviceId(3);
profile.addDisk(iso);