diff --git a/src/tm_mad/fs_lvm/mkimage b/src/tm_mad/fs_lvm/mkimage index 9984833df1..80ba2ae15b 100755 --- a/src/tm_mad/fs_lvm/mkimage +++ b/src/tm_mad/fs_lvm/mkimage @@ -30,13 +30,16 @@ VM_ID=$4 if [ -z "${ONE_LOCATION}" ]; then TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh + LIB_LOCATION=/usr/lib/one else TMCOMMON=$ONE_LOCATION/var/remotes/tm/tm_common.sh + LIB_LOCATION=$ONE_LOCATION/lib fi DRIVER_PATH=$(dirname $0) source $TMCOMMON +source $LIB_LOCATION/sh/scripts_common.sh source ${DRIVER_PATH}/../../datastore/libfs.sh source ${DRIVER_PATH}/../../etc/tm/fs_lvm/fs_lvm.conf source ${DRIVER_PATH}/../../etc/datastore/datastore.conf @@ -63,7 +66,7 @@ unset i j XPATH_ELEMENTS while IFS= read -r -d '' element; do XPATH_ELEMENTS[i++]="$element" -done < <(onevm show -x $VMID | $XPATH \ +done < <(onevm show -x $VM_ID | $XPATH \ /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/FS) FS="${XPATH_ELEMENTS[j++]}" @@ -90,6 +93,9 @@ exclusive "${LOCK}" 120 ssh_exec_and_log "$DST_HOST" "$CREATE_CMD" \ "Error creating LV named $LV_NAME" MKIMAGE_CMD=$(cat <