From f712d5be9e2b18ad7e394f7de903310371d697c3 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Tue, 16 Apr 2013 15:43:33 +0200 Subject: [PATCH] bug #1911: Create at least the folder --- src/mad/sh/scripts_common.sh | 6 ++++++ src/tm_mad/vmfs/clone | 6 ++++++ src/tm_mad/vmfs/ln | 3 +++ 3 files changed, 15 insertions(+) diff --git a/src/mad/sh/scripts_common.sh b/src/mad/sh/scripts_common.sh index 53303918e3..6335b94f43 100644 --- a/src/mad/sh/scripts_common.sh +++ b/src/mad/sh/scripts_common.sh @@ -465,3 +465,9 @@ function vmfs_create_double_path { vifs $VI_PARAMS --force --mkdir [$DS_ID]$FIRST_FOLDER/$SECOND_FOLDER &> /dev/null } + +function vmfs_create_simple_path { + DS_ID=$1 + FIRST_FOLDER=$2 + vifs $VI_PARAMS --force --mkdir [$DS_ID]$FIRST_FOLDER &> /dev/null +} diff --git a/src/tm_mad/vmfs/clone b/src/tm_mad/vmfs/clone index 1f5be040f3..33898bb80b 100755 --- a/src/tm_mad/vmfs/clone +++ b/src/tm_mad/vmfs/clone @@ -84,6 +84,12 @@ if [ "$DISK_TYPE" != "CDROM"]; then else vmfs_create_double_path $SYSTEM_DS_NAME $VMID $DST_FOLDER fi +else + if [ "$USE_SSH" == "yes" ]; then + ssh_make_path $DST_HOST $(dirname $DST_PATH) + else + vmfs_create_simple_path $SYSTEM_DS_NAME $VMID + fi fi #------------------------------------------------------------------------------- diff --git a/src/tm_mad/vmfs/ln b/src/tm_mad/vmfs/ln index c558a34bf2..9ce2652508 100755 --- a/src/tm_mad/vmfs/ln +++ b/src/tm_mad/vmfs/ln @@ -88,6 +88,9 @@ EOF ssh_exec_and_log $DST_HOST "$LINK_SCRIPT" \ "Could not link dir files from $SRC_PATH to $DST_PATH" else + # Just need to create the / folder, not the disk. as well + ssh_make_path $DST_HOST $(dirname $DST_PATH) + log "Link CD-ROM from $SRC_PATH to $DST_PATH" LINK_SCRIPT=$(cat <