← Back to branch summary

~sergiusens/cloud-init/snappy_ssh

« back to all changes in this revision

Viewing changes to cloudinit/config/cc_grub_dpkg.py

  • Committer: Scott Moser
  • Date: 2014-09-17 17:00:35 UTC
  • mfrom: (977.3.1 cloud-init)
  • Revision ID: smoser@ubuntu.com-20140917170035-bre81stg1vtiixgn
https://launchpad.net/bugs/1336855
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.

Show diffs side-by-side

added added

removed removed

Lines of Context:
cloudinit/config/cc_grub_dpkg.py
47
47
            idevs_empty = "false"
48
48
        if idevs is None:
49
49
            idevs = "/dev/sda"
50
 
            for dev in ("/dev/sda", "/dev/vda", "/dev/sda1", "/dev/vda1"):
 
50
            for dev in ("/dev/sda", "/dev/vda", "/dev/xvda",
 
51
                        "/dev/sda1", "/dev/vda1", "/dev/xvda1"):
51
52
                if os.path.exists(dev):
52
53
                    idevs = dev
53
54
                    break