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

feature #1365: Add qcow2 option as a valid FSTYPE when creating images

Browse Source
This commit is contained in:
Ruben S. Montero 2012-07-26 18:09:45 +02:00
parent 1bb25b8461
commit c82f80b1cb
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -250,6 +250,10 @@ function mkfs_command {
echo "$MKSWAP $DST"
return 0
;;
"qcow2")
echo "$QEMU_IMG create -f qcow2 $DST ${SIZE}M"
return 0
;;
"vmdk_"*)
VMWARE_DISK_TYPE=`echo $FSTYPE|cut -d'_' -f 2`
echo "WHICH_SUDO=\$(which sudo) ; \

21
src/tm_mad/common/mkimage
View File

@ -46,20 +46,21 @@ DST_PATH=`arg_path $DST`
DST_HOST=`arg_host $DST`
DST_DIR=`dirname $DST_PATH`
if ! echo "$FSTYPE"|grep -q ^vmdk; then
ssh_make_path $DST_HOST $DST_DIR
else
ssh_make_path $DST_HOST $DST_PATH
fi
#-------------------------------------------------------------------------------
# Make the new image (file-based)
#-------------------------------------------------------------------------------
MKFS_CMD=`mkfs_command $DST_PATH $FSTYPE $SIZE`
case "$FSTYPE" in
"vmdk_"*)
ssh_make_path $DST_HOST $DST_PATH
CREATE_IMAGE=""
;;
*)
ssh_make_path $DST_HOST $DST_DIR
CREATE_IMAGE="$DD if=/dev/zero of=$DST_PATH bs=1 count=1 seek=${SIZE}M"
;;
esac
if ! echo "$FSTYPE"|grep -q ^vmdk; then
CREATE_IMAGE="$DD if=/dev/zero of=$DST_PATH bs=1 count=1 seek=${SIZE}M"
fi
MKFS_CMD=`mkfs_command $DST_PATH $FSTYPE $SIZE`
MKSCRIPT=$(cat <<EOF
export PATH=/usr/sbin:/sbin:\$PATH