From d2c65e74ba4573ff8f0da50d84a140c9fcb9621c Mon Sep 17 00:00:00 2001
From: Tino Vazquez <tinova@opennebula.org>
Date: Fri, 15 Jun 2012 18:07:11 +0200
Subject: [PATCH] Fix sudo issues in ESX 5.x

---
 src/mad/sh/scripts_common.sh |  5 ++++-
 src/tm_mad/vmware/clone      | 11 +++++++++--
 src/tm_mad/vmware/mvds       |  8 +++++++-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/mad/sh/scripts_common.sh b/src/mad/sh/scripts_common.sh
index f8cae6c5cd..0bb132d0a2 100644
--- a/src/mad/sh/scripts_common.sh
+++ b/src/mad/sh/scripts_common.sh
@@ -251,7 +251,10 @@ function mkfs_command {
             ;;
         "vmdk_*")
             VMWARE_DISK_TYPE=`echo $FSTYPE|cut -d'_' -f 1`
-            echo "sudo $VMKFSTOOLS -U $DST/disk.vmdk ; sudo $VMKFSTOOLS -c ${SIZE}M -d ${VMWARE_DISK_TYPE} $DST_PATH/disk.vmdk"
+            echo "WHICH_SUDO=`which sudo` ; \
+                  [ ! -z \"$WHICH_SUDO\" -a -f \"$WHICH_SUDO\" ] && SUDO=\"sudo\" ; \
+                  $SUDO $VMKFSTOOLS -U $DST/disk.vmdk; \ 
+                  $SUDO $VMKFSTOOLS -c ${SIZE}M -d ${VMWARE_DISK_TYPE} $DST_PATH/disk.vmdk"
             return 0
             ;;
         *)
diff --git a/src/tm_mad/vmware/clone b/src/tm_mad/vmware/clone
index 0bead9f979..db12c390f7 100755
--- a/src/tm_mad/vmware/clone
+++ b/src/tm_mad/vmware/clone
@@ -57,8 +57,15 @@ log "Cloning $SRC_PATH in $DST"
 
 CLONESCRIPT=$(cat <<EOF
 cd $DST_DIR
-$VMKFSTOOLS -U $DST_PATH/disk.vmdk
-$VMKFSTOOLS -i $SRC_PATH/disk.vmdk -d thin $DST_PATH/disk.vmdk
+
+WHICH_SUDO=`which sudo`
+
+if [ ! -z "$WHICH_SUDO" -a -f "$WHICH_SUDO" ]; then
+  SUDO="sudo "
+fi
+
+$SUDO $VMKFSTOOLS -U $DST_PATH/disk.vmdk
+$SUDO $VMKFSTOOLS -i $SRC_PATH/disk.vmdk -d thin $DST_PATH/disk.vmdk
 EOF
 )
 
diff --git a/src/tm_mad/vmware/mvds b/src/tm_mad/vmware/mvds
index b64746c797..5bac156220 100755
--- a/src/tm_mad/vmware/mvds
+++ b/src/tm_mad/vmware/mvds
@@ -60,7 +60,13 @@ DST_READLN=eval "$READLINK -f $DST_PATH"
 if [ \( -L $SRC \) -a \( "$SRC_READLN" = "$DST_READLN" \) ] ; then
 	echo "Not moving files to image repo, they are the same"
 else
-	$VMKFSTOOLS -i $SRC_PATH -d thin $DST_PATH
+	WHICH_SUDO=`which sudo`
+
+	if [ ! -z "$WHICH_SUDO" -a -f "$WHICH_SUDO" ]; then
+		SUDO="sudo "
+	fi
+
+	$SUDO $VMKFSTOOLS -i $SRC_PATH -d thin $DST_PATH
 fi
 
 if [ -d $DST_PATH ]; then