From d9b61f26da2ae8407917ba910c163b12e58b45d6 Mon Sep 17 00:00:00 2001
From: Edison Su <edison@cloud.com>
Date: Wed, 1 Jun 2011 10:36:56 -0400
Subject: [PATCH] fix dettach iso issue: if dettach iso failed on hypervisor,
 mgt server still regards it as success, then you can't attach another ISO to
 the vm again unless your stop/start the VM

---
 cloud.spec                                             | 2 +-
 server/src/com/cloud/template/TemplateManagerImpl.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cloud.spec b/cloud.spec
index f791486fd72..b0eedb1ca35 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -221,7 +221,6 @@ Requires: jpackage-utils
 Requires: %{name}-daemonize
 Requires: /sbin/service
 Requires: /sbin/chkconfig
-Requires: jnetpcap
 Group:     System Environment/Libraries
 
 %package baremetal-agent
@@ -304,6 +303,7 @@ The Cloud.com command line tools contain a few Python modules that can call clou
 %package premium-agent
 Summary: Cloud.com premium agent
 Requires: cloud-agent
+Requires: jnetpcap
 Group:     System Environment/Libraries
 %description premium-agent
 The Cloud.com premium agent
diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java
index 2388930c6c5..c5e80bf262d 100755
--- a/server/src/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -827,7 +827,7 @@ public class TemplateManagerImpl implements TemplateManager, Manager, TemplateSe
              vm.setIsoId(iso.getId());
             _userVmDao.update(vmId, vm);
         } 
-        if ( !attach ) {
+        if ( success && !attach ) {
             vm.setIsoId(null);
             _userVmDao.update(vmId, vm);
         }