From 347435ecc4e08e71bf05f7d038e518334abf7a17 Mon Sep 17 00:00:00 2001
From: Tino Vazquez <tinova@opennebula.org>
Date: Thu, 21 Jul 2016 16:51:09 +0200
Subject: [PATCH] Fix for bug in detach disk

(cherry picked from commit f8b58adf3742a1260c145440d7ceb1df5a64d352)
---
 src/vmm_mad/remotes/vcenter/detach_disk       | 2 +-
 src/vmm_mad/remotes/vcenter/vcenter_driver.rb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/vmm_mad/remotes/vcenter/detach_disk b/src/vmm_mad/remotes/vcenter/detach_disk
index 5750610581..887b1eb05c 100755
--- a/src/vmm_mad/remotes/vcenter/detach_disk
+++ b/src/vmm_mad/remotes/vcenter/detach_disk
@@ -62,6 +62,6 @@ begin
                                          ds_name,
                                          img_path)
 rescue Exception => e
-    STDERR.puts "Error detaching image #{img_path} size. Reason: #{e.message}"
+    STDERR.puts "Error detaching image #{img_path}. Reason: #{e.message}"
     exit -1
 end
diff --git a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb
index 6b567a4038..48bd996cb3 100644
--- a/src/vmm_mad/remotes/vcenter/vcenter_driver.rb
+++ b/src/vmm_mad/remotes/vcenter/vcenter_driver.rb
@@ -2650,6 +2650,7 @@ private
         ds_and_img_name = "[#{ds_name}] #{img_path}"
 
         disk  = vm.config.hardware.device.select { |d| is_disk?(d) &&
+                                 d.backing.respond_to?(:fileName) &&
                                  d.backing.fileName == ds_and_img_name }
 
         raise "Disk #{img_path} not found." if disk.nil?