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

Move the >=jessie workaround out of the common task.

Browse source
This commit is contained in:
Zach Marano 2016-03-03 10:14:02 -08:00
parent ee12a3e340
commit 108fa9547e
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bootstrapvz/common/tasks/initd.py
View file

@ -76,9 +76,5 @@ class AdjustGrowpartWorkaround(Task):
@classmethod @classmethod
def run(cls, info): def run(cls, info):
from ..tools import sed_i from ..tools import sed_i
from bootstrapvz.common.releases import jessie
script = os.path.join(info.root, 'etc/init.d/expand-root') script = os.path.join(info.root, 'etc/init.d/expand-root')
if info.manifest.release >= jessie:
sed_i(script, '^growpart="growpart"$', 'growpart-workaround') sed_i(script, '^growpart="growpart"$', 'growpart-workaround')

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

@ -83,13 +83,13 @@ def resolve_tasks(taskset, manifest):
if manifest.release >= jessie: if manifest.release >= jessie:
taskset.add(tasks.packages.AddWorkaroundGrowpart) taskset.add(tasks.packages.AddWorkaroundGrowpart)
taskset.add(initd.AdjustGrowpartWorkaround)
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)
if manifest.volume['partitions']['type'] != 'none': if manifest.volume['partitions']['type'] != 'none':
taskset.add(initd.AdjustExpandRootScript) taskset.add(initd.AdjustExpandRootScript)
taskset.add(initd.AdjustGrowpartWorkaround)
if manifest.system['bootloader'] == 'pvgrub': if manifest.system['bootloader'] == 'pvgrub':
taskset.add(grub.AddGrubPackage) taskset.add(grub.AddGrubPackage)