From d093d6af90eb70f3f5289d2029928863d8b3632b Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Tue, 8 Oct 2013 19:07:55 +0200 Subject: [PATCH] Bug #2106: Use the Image source instead of rebuilding it. Improved action if pool_name is not 'one' --- src/vmm_mad/remotes/kvm/attach_disk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vmm_mad/remotes/kvm/attach_disk b/src/vmm_mad/remotes/kvm/attach_disk index 507e27d9c6..54a62727f4 100755 --- a/src/vmm_mad/remotes/kvm/attach_disk +++ b/src/vmm_mad/remotes/kvm/attach_disk @@ -41,13 +41,13 @@ done < <($XPATH $DISK_XPATH/DRIVER \ $DISK_XPATH/TYPE \ $DISK_XPATH/READONLY \ $DISK_XPATH/CACHE \ - $DISK_XPATH/IMAGE_ID) + $DISK_XPATH/SOURCE) DRIVER="${XPATH_ELEMENTS[j++]:-$DEFAULT_TYPE}" TYPE="${XPATH_ELEMENTS[j++]}" READONLY="${XPATH_ELEMENTS[j++]}" CACHE="${XPATH_ELEMENTS[j++]}" -IMAGE_ID="${XPATH_ELEMENTS[j++]}" +IMG_SRC="${XPATH_ELEMENTS[j++]}" TYPE=$(echo "$TYPE"|tr A-Z a-z) @@ -66,7 +66,7 @@ rbd) TYPE_SOURCE="protocol" TYPE_XML="network" SOURCE="rbd" - SOURCE_ARGS="name='one/one-$IMAGE_ID'" + SOURCE_ARGS="name='$IMG_SRC'" DEVICE="disk" ;; *)