From bf1f6a2998efbd2df5e5e5e63242eda020a8b3ae Mon Sep 17 00:00:00 2001
From: edison <edison@cloud.com>
Date: Mon, 20 Dec 2010 13:53:34 -0800
Subject: [PATCH] Don't need this logic anymore, as xenserver can't handle this
 case: can't boot from an iso that different from the vm's template

Revert "more changes to the attach/detach iso and bootloader flow"

This reverts commit d8f771e05b1570a450f432ce614c81bd78cd8df4.
---
 .../xen/resource/CitrixResourceBase.java      | 23 ++++---------------
 .../src/com/cloud/vm/UserVmManagerImpl.java   |  4 +---
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 03c24bae4b5..20d85b3e59c 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -528,7 +528,7 @@ public abstract class CitrixResourceBase implements ServerResource {
         }
     }
     
-    protected VBD createVbd(Connection conn, VolumeTO volume, String vmName, VM vm, BootloaderType bootLoaderType, String guestOsDisplayName) 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);
@@ -542,25 +542,12 @@ public abstract class CitrixResourceBase implements ServerResource {
         }
         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) {       	
-        	String guestOsTypeName = getGuestOsType(guestOsDisplayName, bootLoaderType == BootloaderType.CD);
-        	if(!(guestOsTypeName.startsWith("Windows") || guestOsTypeName.startsWith("Citrix") || guestOsTypeName.startsWith("Other"))){
-        		if(volume.getName() != null)
-        		{
-	        		String volumeGuestOsTypeName = getGuestOsType(volume.getName(), bootLoaderType == BootloaderType.CD);//NOTE: We set the vol name to guestOs.getDisplayName() in finalizeVirtualMachineProfile()
-	        		if(!(volumeGuestOsTypeName.startsWith("Windows") || volumeGuestOsTypeName.startsWith("Citrix") || volumeGuestOsTypeName.startsWith("Other"))){
-	        			vbdr.bootable = true;
-	        		}else{
-	        			vbdr.bootable = false;
-	        		}
-        		}else{
-        			vbdr.bootable = false;
-        		}
-        	}
-        	
+        if (volume.getType() == VolumeType.ISO) {
             vbdr.mode = Types.VbdMode.RO;
             vbdr.type = Types.VbdType.CD;
         } else {
@@ -788,7 +775,7 @@ public abstract class CitrixResourceBase implements ServerResource {
             vm = createVmFromTemplate(conn, vmSpec, host);
             
             for (VolumeTO disk : vmSpec.getDisks()) {
-                createVbd(conn, disk, vmName, vm, vmSpec.getBootloader(), vmSpec.getOs());
+                createVbd(conn, disk, vmName, vm, vmSpec.getBootloader());
             }
             
             if (vmSpec.getType() != VirtualMachine.Type.User) {
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 1bd813a90f6..c0c91e8f5bf 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2600,9 +2600,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
 				isoPath = isoPathPair.first();
 			}
 			profile.setBootLoaderType(BootloaderType.CD);
-			
-			GuestOSVO guestOs = _guestOSDao.findById(template.getGuestOSId());
-			VolumeTO iso = new VolumeTO(profile.getId(), Volume.VolumeType.ISO, StorageResourceType.STORAGE_POOL, StoragePoolType.ISO, null, guestOs.getDisplayName(), null, isoPath,
+			VolumeTO iso = new VolumeTO(profile.getId(), Volume.VolumeType.ISO, StorageResourceType.STORAGE_POOL, StoragePoolType.ISO, null, template.getName(), null, isoPath,
 										0, null);
 			iso.setDeviceId(3);
 			profile.addDisk(iso);