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

Merge "Fix fedora element to work with qcow2 images."

Browse Source
This commit is contained in:
Jenkins 2013-05-28 23:40:05 +00:00 committed by Gerrit Code Review
commit 6fe4502058
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
elements/fedora/root.d/10-fedora-cloud-image
View File

@ -12,7 +12,7 @@ fi
IMG_PATH=~/.cache/image-create IMG_PATH=~/.cache/image-create
DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-http://mattdm.fedorapeople.org/cloud-images/} DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-http://mattdm.fedorapeople.org/cloud-images/}
DIB_RELEASE=${DIB_RELEASE:-Fedora18} DIB_RELEASE=${DIB_RELEASE:-Fedora18}
BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-$DIB_RELEASE-Cloud-$ARCH-latest.raw.tar.xz} BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-$DIB_RELEASE-Cloud-$ARCH-latest.qcow2}
BASE_IMAGE_TAR=$DIB_RELEASE-Cloud-$ARCH-latest.tgz BASE_IMAGE_TAR=$DIB_RELEASE-Cloud-$ARCH-latest.tgz
mkdir -p $IMG_PATH mkdir -p $IMG_PATH
@ -28,8 +28,10 @@ if [ ! -f $IMG_PATH/$BASE_IMAGE_TAR ] ; then
EACTION="rm -r $WORKING" EACTION="rm -r $WORKING"
trap "$EACTION" EXIT trap "$EACTION" EXIT
echo "Working in $WORKING" echo "Working in $WORKING"
tar -xJC $WORKING -f $IMG_PATH/$BASE_IMAGE_FILE RAW_FILE=$(basename $BASE_IMAGE_FILE)
LOOPDEV=$(sudo losetup --show -r -f $WORKING/*.raw) RAW_FILE=${RAW_FILE#.qcow2}.raw
qemu-img convert -f qcow2 -O raw $IMG_PATH/$BASE_IMAGE_FILE $WORKING/$RAW_FILE
LOOPDEV=$(sudo losetup --show -r -f $WORKING/$RAW_FILE)
EACTION="sudo losetup -d $LOOPDEV;$EACTION" EACTION="sudo losetup -d $LOOPDEV;$EACTION"
trap "$EACTION" EXIT trap "$EACTION" EXIT
sudo partprobe $LOOPDEV sudo partprobe $LOOPDEV