From 4e94880b2a17d5c59e2140e9b9eee41c39ecfee8 Mon Sep 17 00:00:00 2001 From: Jesse Szwedko Date: Tue, 12 Jan 2016 18:33:27 +0000 Subject: [PATCH] Only add growpart workaround on >= Jessie Works on previous distributions Signed-off-by: Andrew Garrett --- bootstrapvz/providers/ec2/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bootstrapvz/providers/ec2/__init__.py b/bootstrapvz/providers/ec2/__init__.py index b057785..21749c6 100644 --- a/bootstrapvz/providers/ec2/__init__.py +++ b/bootstrapvz/providers/ec2/__init__.py @@ -53,7 +53,7 @@ def validate_manifest(data, validator, error): def resolve_tasks(taskset, manifest): - from bootstrapvz.common.releases import wheezy + from bootstrapvz.common.releases import wheezy, jessie taskset.update(task_groups.get_standard_groups(manifest)) taskset.update(task_groups.ssh_group) @@ -68,7 +68,6 @@ def resolve_tasks(taskset, manifest): boot.BlackListModules, boot.DisableGetTTYs, initd.AddExpandRoot, - tasks.packages.AddWorkaroundGrowpart, initd.RemoveHWClock, initd.InstallInitScripts, tasks.ami.RegisterAMI, @@ -82,6 +81,9 @@ def resolve_tasks(taskset, manifest): taskset.add(tasks.network.InstallDHCPCD) taskset.add(tasks.network.EnableDHCPCDDNS) + if manifest.release >= jessie: + taskset.add(tasks.packages.AddWorkaroundGrowpart) + if manifest.provider.get('install_init_scripts', True): taskset.add(tasks.initd.AddEC2InitScripts)