shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-23 22:50:09 +03:00
Code Releases Wiki Activity

Fix sudo issues in ESX 5.x

Browse Source
This commit is contained in:
Tino Vazquez 2012-06-15 18:07:11 +02:00
parent da5a18a886
commit d2c65e74ba
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mad/sh/scripts_common.sh
View File

@ -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
;;
*)

11
src/tm_mad/vmware/clone
View File

@ -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
)

8
src/tm_mad/vmware/mvds
View File

@ -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