Merge "Update Fedora cloud image to its latest version"

This commit is contained in:
Jenkins 2013-07-15 15:37:53 +00:00 committed by Gerrit Code Review
commit 5d84c9ea46

View File

@ -10,9 +10,9 @@ if [ 'amd64' = "$ARCH" ] ; then
fi fi
IMG_PATH=~/.cache/image-create IMG_PATH=~/.cache/image-create
DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-http://mattdm.fedorapeople.org/cloud-images/} DIB_RELEASE=${DIB_RELEASE:-latest}
DIB_RELEASE=${DIB_RELEASE:-Fedora18} DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-http://cloud.fedoraproject.org}
BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-$DIB_RELEASE-Cloud-$ARCH-latest.qcow2} BASE_IMAGE_FILE=${BASE_IMAGE_FILE:-fedora-$DIB_RELEASE.$ARCH.qcow2}
BASE_IMAGE_TAR=$DIB_RELEASE-Cloud-$ARCH-latest.tgz BASE_IMAGE_TAR=$DIB_RELEASE-Cloud-$ARCH-latest.tgz
echo "Fetching Base Image" echo "Fetching Base Image"
@ -31,7 +31,9 @@ if [ ! -f $IMG_PATH/$BASE_IMAGE_TAR -o \
# WARNING: The mattdm image has the root filesystem on the second # WARNING: The mattdm image has the root filesystem on the second
# partition (p2). If he changes the image the MAGIC_BIT # partition (p2). If he changes the image the MAGIC_BIT
# might also need to change. # might also need to change.
MAGIC_BIT=p2 # UPDATE to above warning alluding to Fedora18:
# F19 images have the rootfs partition on p1
MAGIC_BIT=p1
# XXX: Parsing stdout is dangerous, would like a better way to discover # XXX: Parsing stdout is dangerous, would like a better way to discover
# the device used for the image. # the device used for the image.
# NOTE: On F17 (parted-3.0-10.fc17.x86_64), partprobe of # NOTE: On F17 (parted-3.0-10.fc17.x86_64), partprobe of