From 6583c90141a6fbd8ec1ad1939f7b20205fd8764b Mon Sep 17 00:00:00 2001
From: Tino Vazquez <tinova@opennebula.org>
Date: Wed, 14 Nov 2012 15:33:45 +0100
Subject: [PATCH] bug #1654: Add bridge list to mkfs vmfs script

---
 src/datastore_mad/remotes/vmfs/mkfs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/datastore_mad/remotes/vmfs/mkfs b/src/datastore_mad/remotes/vmfs/mkfs
index 63a6784738..a76c503239 100755
--- a/src/datastore_mad/remotes/vmfs/mkfs
+++ b/src/datastore_mad/remotes/vmfs/mkfs
@@ -52,6 +52,7 @@ done < <($XPATH     /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
                     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/RESTRICTED_DIRS \
                     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/SAFE_DIRS \
                     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/UMASK \
+                    /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \
                     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/DS_USE_SSH \
                     /DS_DRIVER_ACTION_DATA/DATASTORE/ID \
                     /DS_DRIVER_ACTION_DATA/IMAGE/FSTYPE \
@@ -62,11 +63,12 @@ BASE_PATH="${XPATH_ELEMENTS[0]}"
 RESTRICTED_DIRS="${XPATH_ELEMENTS[1]}"
 SAFE_DIRS="${XPATH_ELEMENTS[2]}"
 UMASK="${XPATH_ELEMENTS[3]}"
-USE_SSH="${XPATH_ELEMENTS[4]:-$DS_USE_SSH}"
-DS_ID="${XPATH_ELEMENTS[5]}"
-FSTYPE="${XPATH_ELEMENTS[6]}"
-SIZE="${XPATH_ELEMENTS[7]}"
-IMAGE_ID="${XPATH_ELEMENTS[8]}"
+BRIDGE_LIST="${XPATH_ELEMENTS[4]}"
+USE_SSH="${XPATH_ELEMENTS[5]:-$DS_USE_SSH}"
+DS_ID="${XPATH_ELEMENTS[6]}"
+FSTYPE="${XPATH_ELEMENTS[7]}"
+SIZE="${XPATH_ELEMENTS[8]}"
+IMAGE_ID="${XPATH_ELEMENTS[9]}"
 DST=`generate_image_path`
 DST_DIR=`dirname $DST`
 DST_FOLDER=`basename $DST`
@@ -94,7 +96,7 @@ log "Making filesystem of ${SIZE}M (with no format) at [$DS_ID]$DST_FOLDER on $D
 IMAGE_FORMAT=vmdk
 VMWARE_DISK_TYPE=`echo $FSTYPE|cut -d'_' -f 2`
 
-if [ "$USE_SSH" == "yes" ]; then    
+if [ "$USE_SSH" == "yes" ]; then
     $SSH $DST_HOST $VMKFSTOOLS -U [$DS_ID]$DST_FOLDER/disk.vmdk &> /dev/null
     ssh_exec_and_log $DST_HOST "$VMKFSTOOLS -c ${SIZE}M -d ${VMWARE_DISK_TYPE} /vmfs/volumes/$DS_ID/$DST_FOLDER/disk.vmdk" \
                                "Cannot create [$DS_ID] $DST_FOLDER/disk.vmdk on $DST_HOST"