kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 15:36:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

root_device_name simplified

Browse source 
It's not needed for s3 and always sda on ebs
This commit is contained in:
Anders Ingemann 2013-12-08 17:04:28 +01:00
parent 3fef39d4d5
commit a7bc4446c2
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
providers/ec2/tasks/ami.py
View file

@ -158,16 +158,13 @@ class RegisterAMI(Task):
if info.manifest.volume['backing'] == 's3': if info.manifest.volume['backing'] == 's3':
grub_boot_device = 'hd0' grub_boot_device = 'hd0'
registration_params['root_device_name'] = 'dev/sda1'
else: else:
registration_params['root_device_name'] = '/dev/sda'
from base.fs.partitionmaps.none import NoPartitions from base.fs.partitionmaps.none import NoPartitions
if isinstance(info.volume.partition_map, NoPartitions): if isinstance(info.volume.partition_map, NoPartitions):
grub_boot_device = 'hd0' grub_boot_device = 'hd0'
registration_params['root_device_name'] = '/dev/sda'
else: else:
grub_boot_device = 'hd00' grub_boot_device = 'hd00'
root_idx = info.volume.partition_map.root.get_index()
registration_params['root_device_name'] = '/dev/sda{idx}'.format(idx=root_idx)
from boto.ec2.blockdevicemapping import BlockDeviceType from boto.ec2.blockdevicemapping import BlockDeviceType
from boto.ec2.blockdevicemapping import BlockDeviceMapping from boto.ec2.blockdevicemapping import BlockDeviceMapping