From d5969d1a23bfa584c8e71a97a3664879afe67591 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Thu, 31 Jul 2014 16:06:08 -0700
Subject: [PATCH] amis: update publish script for new block device mapping

---
 oem/ami/prod-publish.sh | 2 +-
 oem/ami/publish_ami.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/oem/ami/prod-publish.sh b/oem/ami/prod-publish.sh
index b009f5e4fc..1fd88ed0b5 100755
--- a/oem/ami/prod-publish.sh
+++ b/oem/ami/prod-publish.sh
@@ -12,4 +12,4 @@ fi
 
 set -e
 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
diff --git a/oem/ami/publish_ami.sh b/oem/ami/publish_ami.sh
index e3cfbc89c8..a7da69d58f 100755
--- a/oem/ami/publish_ami.sh
+++ b/oem/ami/publish_ami.sh
@@ -94,7 +94,7 @@ publish_ami() {
     local virt_type="$2"
     local r_amiid="$3"
     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
     set -e