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

Merge branch 'feature-1223' of git.opennebula.org:one into feature-1223

Browse Source
This commit is contained in:
Tino Vazquez 2012-06-18 16:51:04 +02:00
commit bbdbaa512e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -251,9 +251,9 @@ function mkfs_command {
;;
"vmdk_*")
VMWARE_DISK_TYPE=`echo $FSTYPE|cut -d'_' -f 1`
echo "WHICH_SUDO=`which sudo` ; \
[ ! -z \"$WHICH_SUDO\" -a -f \"$WHICH_SUDO\" ] && SUDO=\"sudo\" ; \
$SUDO $VMKFSTOOLS -U $DST/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
;;

4
src/tm_mad/vmware/clone
View File

@ -58,9 +58,9 @@ log "Cloning $SRC_PATH in $DST"
CLONESCRIPT=$(cat <<EOF
cd $DST_DIR
WHICH_SUDO=`which sudo`
WHICH_SUDO=\$(which sudo)
if [ ! -z "$WHICH_SUDO" -a -f "$WHICH_SUDO" ]; then
if [ ! -z "\$WHICH_SUDO" -a -f "\$WHICH_SUDO" ]; then
SUDO="sudo "
fi