From 104d6746596f12fdc051ce869cc1c04b7ea0a1a6 Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel.watkins@canonical.com>
Date: Thu, 12 Jan 2017 11:56:03 +0000
Subject: Import version 0.7.8-49-g9e904bb-0ubuntu1~16.04.4 with git-import-dsc
* debian/update-grub-legacy-ec2:
- Correctly detect kernels ending in -aws as kernels that can boot on EC2
(LP: #1655934)
LP: #1655934
---
debian/changelog | 8 ++++++++
debian/update-grub-legacy-ec2 | 1 +
2 files changed, 9 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 93523de8..0265e7de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+cloud-init (0.7.8-49-g9e904bb-0ubuntu1~16.04.4) xenial; urgency=medium
+
+ * debian/update-grub-legacy-ec2:
+ - Correctly detect kernels ending in -aws as kernels that can boot on EC2
+ (LP: #1655934)
+
+ -- Daniel Watkins <daniel.watkins@canonical.com> Thu, 12 Jan 2017 11:56:03 +0000
+
cloud-init (0.7.8-49-g9e904bb-0ubuntu1~16.04.3) xenial-proposed; urgency=medium
* debian/cherry-pick: use git format-patch rather than git show
diff --git a/debian/update-grub-legacy-ec2 b/debian/update-grub-legacy-ec2
index 19648f6d..337757b3 100755
--- a/debian/update-grub-legacy-ec2
+++ b/debian/update-grub-legacy-ec2
@@ -1405,6 +1405,7 @@ if ! type is_xen_kernel >/dev/null 2>&1; then
ver_flavor="${1##*vmlinuz-}"
case "${ver_flavor}" in
+ *-aws) return 0;;
*-ec2) return 0;;
*-virtual)
# 10.04 LTS through 12.04 LTS -virtual is the EC2/Xen kernel
--
cgit v1.2.3