summaryrefslogtreecommitdiff
path: root/cloudinit/config/cc_grub_dpkg.py
diff options
context:
space:
mode:
authorBen Howard <ben.howard@canonical.com>2014-07-02 11:20:54 -0600
committerBen Howard <ben.howard@canonical.com>2014-07-02 11:20:54 -0600
commita9f7e5cfa5bd2ce692178c3784cc08271276dcac (patch)
tree6bc904d41844e38c838f5f822ab3fd3570afb13b /cloudinit/config/cc_grub_dpkg.py
parent9a61ab153ab9d68fb796650666d4ad6729926685 (diff)
downloadvyos-cloud-init-a9f7e5cfa5bd2ce692178c3784cc08271276dcac.tar.gz
vyos-cloud-init-a9f7e5cfa5bd2ce692178c3784cc08271276dcac.zip
Fix for cc_grub_dpkg ignoring /dev/xvda devices as candidates (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 b3ce6fb6..d96e85cf 100644
--- a/cloudinit/config/cc_grub_dpkg.py
+++ b/cloudinit/config/cc_grub_dpkg.py
@@ -46,7 +46,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