mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-23 14:41:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(build_ebs_on_ec2.sh): Add --fail to all curl commands.

Browse Source 
This is particularly important for the image availability pre-check
because without it we don't detect that the image is in-fact unavailable
when it doesn't exist and the 404 results in a error from bzip2.
This commit is contained in:
Michael Marineau 2013-08-07 15:44:52 -04:00
parent f48858b6eb
commit 3ef4757fd4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
oem/ami/build_ebs_on_ec2.sh
View File

@ -73,7 +73,7 @@ else
if [[ -z "$IMG_URL" ]]; then if [[ -z "$IMG_URL" ]]; then
IMG_URL=$(printf "$URL_FMT" "$VERSION") IMG_URL=$(printf "$URL_FMT" "$VERSION")
fi fi
if ! curl -s --head "$IMG_URL" >/dev/null; then if ! curl --fail -s --head "$IMG_URL" >/dev/null; then
echo "$0: Image URL unavailable: $IMG_URL" >&2 echo "$0: Image URL unavailable: $IMG_URL" >&2
exit 1 exit 1
fi fi
@ -97,7 +97,7 @@ name=$(sed -e "s%[^A-Za-z0-9()\\./_-]%_%g" <<< "CoreOS-$VERSION")
description="CoreOS $VERSION" description="CoreOS $VERSION"
zoneurl=http://instance-data/latest/meta-data/placement/availability-zone zoneurl=http://instance-data/latest/meta-data/placement/availability-zone
zone=$(curl -s $zoneurl) zone=$(curl --fail -s $zoneurl)
region=$(echo $zone | sed 's/.$//') region=$(echo $zone | sed 's/.$//')
akiid=${AKI[$region]} akiid=${AKI[$region]}
@ -125,7 +125,7 @@ echo "Building AMI in zone $zone, region id $akiid"
# Create and mount temporary EBS volume with file system to hold new AMI image # Create and mount temporary EBS volume with file system to hold new AMI image
volumeid=$(ec2-create-volume --size $size --availability-zone $zone | volumeid=$(ec2-create-volume --size $size --availability-zone $zone |
cut -f2) cut -f2)
instanceid=$(curl -s http://instance-data/latest/meta-data/instance-id) instanceid=$(curl --fail -s http://instance-data/latest/meta-data/instance-id)
echo "Attaching new volume $volumeid locally (instance $instanceid)" echo "Attaching new volume $volumeid locally (instance $instanceid)"
ec2-attach-volume --device /dev/sdi --instance "$instanceid" "$volumeid" ec2-attach-volume --device /dev/sdi --instance "$instanceid" "$volumeid"
while [ ! -e /dev/sdi -a ! -e /dev/xvdi ] while [ ! -e /dev/sdi -a ! -e /dev/xvdi ]
@ -147,7 +147,7 @@ if [[ -n "$IMG_PATH" ]]; then
dd if="$IMG_PATH" of=$dev bs=1M dd if="$IMG_PATH" of=$dev bs=1M
fi fi
else else
curl "$IMG_URL" | bunzip2 | dd of=$dev bs=1M curl --fail "$IMG_URL" | bunzip2 | dd of=$dev bs=1M
fi fi
echo "Detaching $volumeid and creating snapshot" echo "Detaching $volumeid and creating snapshot"