sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Grab the next available /dev/nbdX."

Browse Source
This commit is contained in:
Jenkins 2013-04-12 19:59:18 +00:00 committed by Gerrit Code Review
commit 2c442c5b02
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bin/disk-image-create
View File

@ -98,15 +98,10 @@ eval_run_d block-device-size "DIB_IMAGE_SIZE="
qemu-img create -f qcow2 -o preallocation=metadata $TMP_IMAGE_PATH ${DIB_IMAGE_SIZE}G qemu-img create -f qcow2 -o preallocation=metadata $TMP_IMAGE_PATH ${DIB_IMAGE_SIZE}G
# Should have a grab-next-dev helper ? # grab the next available /dev/nbdX and connect to it
NBD_DEV=/dev/nbd0 map_nbd $TMP_IMAGE_PATH
if [[ $(qemu-nbd --help | grep cache) == *writeback* ]] ; then echo "NBD Device: $NBD_DEV"
CACHE="--cache=writeback"
else
echo "Warning: qemu-nbd without --cache=writeback is /slow/."
CACHE=""
fi
sudo qemu-nbd -c $NBD_DEV $CACHE $TMP_IMAGE_PATH
export EXTRA_UNMOUNT="sudo qemu-nbd -d $NBD_DEV" export EXTRA_UNMOUNT="sudo qemu-nbd -d $NBD_DEV"
export IMAGE_BLOCK_DEVICE=$NBD_DEV export IMAGE_BLOCK_DEVICE=$NBD_DEV
eval_run_d block-device "IMAGE_BLOCK_DEVICE=" eval_run_d block-device "IMAGE_BLOCK_DEVICE="