From 4bc92ec6d65f838af536c5697c006bb397a48f8d Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Mon, 25 Feb 2013 17:37:14 +0100
Subject: [PATCH] Bug #1521: Use the original image size for cloning, instead
 of the default image size

---
 src/tm_mad/lvm/clone | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/tm_mad/lvm/clone b/src/tm_mad/lvm/clone
index 7e30e0d778..89bc99d6a1 100755
--- a/src/tm_mad/lvm/clone
+++ b/src/tm_mad/lvm/clone
@@ -49,24 +49,15 @@ DST_PATH=`arg_path $DST`
 DST_HOST=`arg_host $DST`
 DST_DIR=`dirname $DST_PATH`
 
-#-------------------------------------------------------------------------------
-# Get SIZE through XPATH
-#-------------------------------------------------------------------------------
-
-DISK_ID=$(echo $DST_PATH|awk -F. '{print $NF}')
-
-XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin"
-XPATH="$XPATH /VM/TEMPLATE/DISK[DISK_ID='$DISK_ID']/SIZE"
-
-SIZE=$(onevm show -x $VM_ID | $XPATH )
-[ -z "$SIZE" ] && SIZE=$DEFAULT_SIZE
-
 #-------------------------------------------------------------------------------
 # Get other LVM related fields
 #-------------------------------------------------------------------------------
 
 LV_NAME=`echo $SRC_PATH|cut -d. -f2`
 VG_NAME=`echo $SRC_PATH|cut -d. -f1`
+DEV="/dev/${VG_NAME}/${LV_NAME}"
+
+DISK_ID=$(echo $DST_PATH|awk -F. '{print $NF}')
 
 TARGET_DEV="/dev/$VG_NAME/$LV_NAME"
 LV_CLONE="$LV_NAME-$VM_ID-$DISK_ID"
@@ -79,7 +70,9 @@ LV_CLONE_DEV="/dev/$VG_NAME/$LV_CLONE"
 CLONE_CMD=$(cat <<EOF
     set -e
     mkdir -p $DST_DIR
-    $SUDO $LVCREATE -L$SIZE -n $LV_CLONE $VG_NAME
+    SIZE=\$($SUDO $LVS $DEV --noheadings --nosuffix --units m -o lv_size \
+            | tr -d ' ')
+    $SUDO $LVCREATE -L\${SIZE}M -n $LV_CLONE $VG_NAME
     $SUDO $DD if=$TARGET_DEV of=$LV_CLONE_DEV bs=64k
     ln -s "$LV_CLONE_DEV" "$DST_PATH"
 EOF