From a7bc4446c21806edb9bc909958715ddd3cf9ba24 Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Sun, 8 Dec 2013 17:04:28 +0100 Subject: [PATCH] root_device_name simplified It's not needed for s3 and always sda on ebs --- providers/ec2/tasks/ami.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/providers/ec2/tasks/ami.py b/providers/ec2/tasks/ami.py index 0a06478..3b5cbd0 100644 --- a/providers/ec2/tasks/ami.py +++ b/providers/ec2/tasks/ami.py @@ -158,16 +158,13 @@ class RegisterAMI(Task): if info.manifest.volume['backing'] == 's3': grub_boot_device = 'hd0' - registration_params['root_device_name'] = 'dev/sda1' else: + registration_params['root_device_name'] = '/dev/sda' from base.fs.partitionmaps.none import NoPartitions if isinstance(info.volume.partition_map, NoPartitions): grub_boot_device = 'hd0' - registration_params['root_device_name'] = '/dev/sda' else: 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 BlockDeviceMapping