summaryrefslogtreecommitdiff
path: root/cloudinit/config/cc_grub_dpkg.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2014-09-17 13:00:35 -0400
committerScott Moser <smoser@ubuntu.com>2014-09-17 13:00:35 -0400
commitd8aa66ff8fda89c18a9fc7f8accd8a3d816f416e (patch)
treef4b71c3f422cd10e002095fdcbd1a1c08fab6fcb /cloudinit/config/cc_grub_dpkg.py
parent5d51578e5aaa3fd96eb7505a0d625abe65553a67 (diff)
parenta9f7e5cfa5bd2ce692178c3784cc08271276dcac (diff)
downloadvyos-cloud-init-d8aa66ff8fda89c18a9fc7f8accd8a3d816f416e.tar.gz
vyos-cloud-init-d8aa66ff8fda89c18a9fc7f8accd8a3d816f416e.zip
cc_grub_dpkg consider /dev/xvda as a candidate for grub installation
HVM instances on EC2 have grub on /dev/xvda. The bug here resulted in a prompt on grub update. LP: #1336855
Diffstat (limited to 'cloudinit/config/cc_grub_dpkg.py')
-rw-r--r--cloudinit/config/cc_grub_dpkg.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/cloudinit/config/cc_grub_dpkg.py b/cloudinit/config/cc_grub_dpkg.py
index 85716a91..e3219e81 100644
--- a/cloudinit/config/cc_grub_dpkg.py
+++ b/cloudinit/config/cc_grub_dpkg.py
@@ -47,7 +47,8 @@ def handle(_name, cfg, _cloud, log, _args):
idevs_empty = "false"
if idevs is None:
idevs = "/dev/sda"
- for dev in ("/dev/sda", "/dev/vda", "/dev/sda1", "/dev/vda1"):
+ for dev in ("/dev/sda", "/dev/vda", "/dev/xvda",
+ "/dev/sda1", "/dev/vda1", "/dev/xvda1"):
if os.path.exists(dev):
idevs = dev
break