From f72d744a7a5161448e7c3bbaf06e8ba8c1378ed7 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 30 Jul 2014 14:06:44 -0700 Subject: [PATCH] amis: switch back to sda for root PV volume, add publish wrapper If additional EBS volumes are mapped to a PV instance using a "sd*" name they will always be ordered by the hypervisor before "xvd*" devices, again ignoring the root device definition. This applies to all PV instance types so we cannot get away with just poo-pooing m1.small. We will need to call attention to this since it requires users who set the volume size via APIs to use the name "/dev/sda" again. --- oem/ami/build_ebs_on_ec2.sh | 6 +++--- oem/ami/prod-publish.sh | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100755 oem/ami/prod-publish.sh diff --git a/oem/ami/build_ebs_on_ec2.sh b/oem/ami/build_ebs_on_ec2.sh index 9fbd707f53..a3b45a4569 100755 --- a/oem/ami/build_ebs_on_ec2.sh +++ b/oem/ami/build_ebs_on_ec2.sh @@ -178,9 +178,9 @@ amiid=$(ec2-register \ --architecture "$arch" \ --virtualization-type paravirtual \ --kernel "$akiid" \ - --root-device-name /dev/xvda \ - --block-device-mapping /dev/xvda=$snapshotid::true \ - --block-device-mapping /dev/xvdb=ephemeral0 | + --root-device-name /dev/sda \ + --block-device-mapping /dev/sda=$snapshotid::true \ + --block-device-mapping /dev/sdb=ephemeral0 | cut -f2) cat <&2 + exit 1 +fi + +set -e +source $DIR/marineam-auth.sh +$DIR/publish_ami.sh -b $BOARD -g $GROUP -V $VER"