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

Only add growpart workaround on >= Jessie

Browse source 
Works on previous distributions

Signed-off-by: Andrew Garrett <andrew.garrett@getbraintree.com>
This commit is contained in:
Jesse Szwedko 2016-01-12 18:33:27 +00:00 • committed by Jonh
parent 4429c226a8
commit 4e94880b2a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bootstrapvz/providers/ec2/__init__.py
View file

@ -53,7 +53,7 @@ def validate_manifest(data, validator, error):
def resolve_tasks(taskset, manifest): 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.get_standard_groups(manifest))
taskset.update(task_groups.ssh_group) taskset.update(task_groups.ssh_group)
@ -68,7 +68,6 @@ def resolve_tasks(taskset, manifest):
boot.BlackListModules, boot.BlackListModules,
boot.DisableGetTTYs, boot.DisableGetTTYs,
initd.AddExpandRoot, initd.AddExpandRoot,
tasks.packages.AddWorkaroundGrowpart,
initd.RemoveHWClock, initd.RemoveHWClock,
initd.InstallInitScripts, initd.InstallInitScripts,
tasks.ami.RegisterAMI, tasks.ami.RegisterAMI,
@ -82,6 +81,9 @@ def resolve_tasks(taskset, manifest):
taskset.add(tasks.network.InstallDHCPCD) taskset.add(tasks.network.InstallDHCPCD)
taskset.add(tasks.network.EnableDHCPCDDNS) taskset.add(tasks.network.EnableDHCPCDDNS)
if manifest.release >= jessie:
taskset.add(tasks.packages.AddWorkaroundGrowpart)
if manifest.provider.get('install_init_scripts', True): if manifest.provider.get('install_init_scripts', True):
taskset.add(tasks.initd.AddEC2InitScripts) taskset.add(tasks.initd.AddEC2InitScripts)