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

bug 7472: fixing the bootloader issue, wherein a vm with iso attached fails to boot up, when trying to start from a stopped state 

status 7472: resolved fixed
This commit is contained in:
abhishek 2010-12-10 10:39:26 -08:00
parent 6a6f0874ae
commit a5c368f7e2
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -721,7 +721,7 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
}
}
protected VBD createVbd(Connection conn, VolumeTO volume, String vmName, VM vm) throws XmlRpcException, XenAPIException {
protected VBD createVbd(Connection conn, VolumeTO volume, String vmName, VM vm, BootloaderType bootLoaderType) throws XmlRpcException, XenAPIException {
VolumeType type = volume.getType();
VDI vdi = mount(conn, vmName, volume);
@ -733,17 +733,19 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
else {
vbdr.empty = true;
}
if (type == VolumeType.ROOT) {
if (type == VolumeType.ROOT && bootLoaderType == BootloaderType.PyGrub) {
vbdr.bootable = true;
}else if(type == VolumeType.ISO && bootLoaderType == BootloaderType.CD) {
vbdr.bootable = true;
}
vbdr.userdevice = Long.toString(volume.getDeviceId());
if (volume.getType() == VolumeType.ISO) {
vbdr.mode = Types.VbdMode.RO;
vbdr.type = Types.VbdType.CD;
} else {
vbdr.mode = Types.VbdMode.RW;
vbdr.type = Types.VbdType.DISK;
vbdr.type = Types.VbdType.DISK;
}
VBD vbd = VBD.create(conn, vbdr);
@ -969,7 +971,7 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
vm = createVmFromTemplate(conn, vmSpec, host);
for (VolumeTO disk : vmSpec.getDisks()) {
createVbd(conn, disk, vmName, vm);
createVbd(conn, disk, vmName, vm, vmSpec.getBootloader());
}
if (vmSpec.getType() != VirtualMachine.Type.User) {