amis: update publish script for new block device mapping

This commit is contained in:
Michael Marineau 2014-07-31 16:06:08 -07:00
parent 569ad7ff31
commit d5969d1a23
2 changed files with 2 additions and 2 deletions

View File

@ -12,4 +12,4 @@ fi
set -e set -e
source $DIR/marineam-auth.sh source $DIR/marineam-auth.sh
$DIR/publish_ami.sh -b $BOARD -g $GROUP -V $VER" $DIR/publish_ami.sh -b $BOARD -g $GROUP -V $VER

View File

@ -94,7 +94,7 @@ publish_ami() {
local virt_type="$2" local virt_type="$2"
local r_amiid="$3" local r_amiid="$3"
local r_snapshotid=$(ec2-describe-images --region="$r" "$r_amiid" \ local r_snapshotid=$(ec2-describe-images --region="$r" "$r_amiid" \
| grep '^BLOCKDEVICEMAPPING.*/dev/xvda' | cut -f5) || true | grep -E '^BLOCKDEVICEMAPPING.*/dev/(xv|s)da' | cut -f5) || true
# run in a subshell, the -e flag doesn't get inherited # run in a subshell, the -e flag doesn't get inherited
set -e set -e