From 8d8247ab8e7f5171f0bfab4fb420dc39b45ce937 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Fri, 7 Sep 2012 18:55:32 +0200 Subject: [PATCH] feature #1437: Stub for mkfs for VMFS datastore --- src/datastore_mad/remotes/vmfs/mkfs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/datastore_mad/remotes/vmfs/mkfs b/src/datastore_mad/remotes/vmfs/mkfs index 13cd67afdf..5c0e0a0bd5 100755 --- a/src/datastore_mad/remotes/vmfs/mkfs +++ b/src/datastore_mad/remotes/vmfs/mkfs @@ -25,14 +25,17 @@ if [ -z "${ONE_LOCATION}" ]; then LIB_LOCATION=/usr/lib/one + VMWARERC=/etc/one/vmwarerc else LIB_LOCATION=$ONE_LOCATION/lib + VMWARERC=$ONE_LOCATION/etc/vmwarerc fi . $LIB_LOCATION/sh/scripts_common.sh DRIVER_PATH=$(dirname $0) source ${DRIVER_PATH}/../libfs.sh +source $(dirname $0)/vmfsrc # -------- Get mkfs and datastore arguments from OpenNebula core ------------ @@ -59,10 +62,10 @@ UMASK="${XPATH_ELEMENTS[3]}" FSTYPE="${XPATH_ELEMENTS[4]}" SIZE="${XPATH_ELEMENTS[5]}" -mkdir -p "$BASE_PATH" set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS" "$UMASK" DST=`generate_image_path` +DST_HOST=`get_destination_host` # ------------ Image to save_as disk, no need to create a FS ------------