x/cloud-init
Code Issues Proposed changes

cc_grub_dpkg consider /dev/xvda as a candidate for grub installation

Browse Source 
HVM instances on EC2 have grub on /dev/xvda.
The bug here resulted in a prompt on grub update.
This commit is contained in:
Scott Moser 2014-09-17 13:00:35 -04:00
commit 89a61fc32b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -35,6 +35,8 @@
- configdrive: fix reading of vendor data to be like metadata service reader. - configdrive: fix reading of vendor data to be like metadata service reader.
[Jay Faulkner] [Jay Faulkner]
- resizefs: fix broken background resizing [Jay Faulkner] (LP: #1338614) - resizefs: fix broken background resizing [Jay Faulkner] (LP: #1338614)
- cc_grub_dpkg: fix EC2 hvm instances to avoid prompt on grub update.
(LP: #1336855)
0.7.5: 0.7.5:
- open 0.7.5 - open 0.7.5
- Add a debug log message around import failures - Add a debug log message around import failures

3
cloudinit/config/cc_grub_dpkg.py
View File

@ -47,7 +47,8 @@ def handle(_name, cfg, _cloud, log, _args):
idevs_empty = "false" idevs_empty = "false"
if idevs is None: if idevs is None:
idevs = "/dev/sda" 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): if os.path.exists(dev):
idevs = dev idevs = dev
break break