From e85cc06a403c5905e88eab402db5e6bbc08a4c31 Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Fri, 9 Oct 2009 18:23:56 +0000 Subject: [PATCH] Fixed some bugs in the lvm tm_clone.sh script (#32) git-svn-id: http://svn.opennebula.org/one/trunk@831 3034c82b-c49b-4eb3-8279-a7acafdc01c0 --- src/tm_mad/lvm/tm_clone.sh | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/tm_mad/lvm/tm_clone.sh b/src/tm_mad/lvm/tm_clone.sh index cba14e9a42..24828d4f7f 100755 --- a/src/tm_mad/lvm/tm_clone.sh +++ b/src/tm_mad/lvm/tm_clone.sh @@ -26,10 +26,11 @@ if [ -z "${ONE_LOCATION}" ]; then LVMRC=/etc/one/tm_lvm/tm_lvmrc else TMCOMMON=$ONE_LOCATION/lib/mads/tm_common.sh - LVMRC=$ONE_LOCATION/etc/one/tm_lvm/tm_lvmrc + LVMRC=$ONE_LOCATION/etc/tm_lvm/tm_lvmrc fi . $TMCOMMON +. $LVMRC SRC_PATH=`arg_path $SRC` DST_PATH=`arg_path $DST` @@ -51,7 +52,7 @@ DST_DIR=`dirname $DST_PATH` log "Creating directory $DST_DIR" exec_and_log "ssh $DST_HOST mkdir -p $DST_DIR" -case $SRC in +case $SRC_PATH in #------------------------------------------------------------------------------ #Get the image from http repository and dump it to a new LV #------------------------------------------------------------------------------ @@ -62,13 +63,11 @@ http://*) exec_and_log "ssh $DST_HOST wget -O $TMP_NAME $SRC" log "Creating LV $LV_NAME" - exec_and_log "ssh $DST_HOST sudo /usr/sbin/lvcreate -L$SIZE "\ - "-n $LV_NAME $VG_NAME" + exec_and_log "ssh $DST_HOST sudo lvcreate -L$SIZE -n $LV_NAME $VG_NAME" exec_and_log "ssh $DST_HOST ln -s /dev/$VG_NAME/$LV_NAME $DST_PATH" log "Dumping Image $TMP_NAME into $/dev/$VG_NAME/$LV_NAME" - exec_and_log "ssh $DST_HOST sudo dd if=$TMP_NAME "\ - "of=/dev/$VG_NAME/$LV_NAME bs=64k" + exec_and_log "ssh $DST_HOST sudo dd if=$TMP_NAME of=/dev/$VG_NAME/$LV_NAME bs=64k" exec_and_log "ssh $DST_HOST rm -f $TMP_NAME" ;; @@ -77,8 +76,7 @@ http://*) #------------------------------------------------------------------------------ /dev/*) log "Cloning LV $LV_NAME" - exec_and_log "ssh $DST_HOST sudo /usr/sbin/lvcreate -s -L$SIZE "\ - "-n $LV_NAME $VG_NAME" + exec_and_log "ssh $DST_HOST sudo lvcreate -s -L$SIZE -n $LV_NAME $SRC_PATH" exec_and_log "ssh $DST_HOST ln -s /dev/$VG_NAME/$LV_NAME $DST_PATH" ;; @@ -90,16 +88,12 @@ http://*) exec_and_log "scp $SRC $DST.scp" log "Creating LV $LV_NAME" - exec_and_log "ssh $DST_HOST sudo /usr/sbin/lvcreate -L$SIZE "\ - "-n $LV_NAME $VG_NAME" + exec_and_log "ssh $DST_HOST sudo lvcreate -L$SIZE -n $LV_NAME $VG_NAME" exec_and_log "ssh $DST_HOST ln -s /dev/$VG_NAME/$LV_NAME $DST_PATH" log "Dumping Image" - exec_and_log "ssh $DST_HOST sudo dd if=$DST_PATH.scp "\ - "of=/dev/$VG_NAME/$VOL_NAME bs=64k" + exec_and_log "ssh $DST_HOST sudo dd if=$DST_PATH.scp of=/dev/$VG_NAME/$LV_NAME bs=64k" exec_and_log "ssh $DST_HOST rm -f $DST_PATH.scp" ;; esac -exec_and_log "ssh $DST_HOST chmod a+w $DST_PATH" -