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

Merge pull request #487 from john-pierce/ec2_extlinux

Browse source 
EC2: Only add grub specific tasks if using grub
This commit is contained in:
Anders Ingemann 2018-07-16 16:52:33 +02:00 • committed by GitHub
commit 2d64ddb867
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -65,14 +65,10 @@ def resolve_tasks(taskset, manifest):
connection.GetCredentials, connection.GetCredentials,
ami.AMIName, ami.AMIName,
connection.Connect, connection.Connect,
tuning.TuneSystem, tuning.TuneSystem,
tuning.BlackListModules, tuning.BlackListModules,
bootstrapvz.common.tasks.boot.BlackListModules, bootstrapvz.common.tasks.boot.BlackListModules,
bootstrapvz.common.tasks.boot.DisableGetTTYs, bootstrapvz.common.tasks.boot.DisableGetTTYs,
boot.AddXenGrubConsoleOutputDevice,
bootstrapvz.common.tasks.grub.WriteGrubConfig,
boot.UpdateGrubConfig,
bootstrapvz.common.tasks.initd.AddExpandRoot, bootstrapvz.common.tasks.initd.AddExpandRoot,
bootstrapvz.common.tasks.initd.RemoveHWClock, bootstrapvz.common.tasks.initd.RemoveHWClock,
bootstrapvz.common.tasks.initd.InstallInitScripts, bootstrapvz.common.tasks.initd.InstallInitScripts,
@ -101,6 +97,11 @@ def resolve_tasks(taskset, manifest):
if manifest.volume['partitions']['type'] != 'none': if manifest.volume['partitions']['type'] != 'none':
taskset.add(bootstrapvz.common.tasks.initd.AdjustExpandRootScript) taskset.add(bootstrapvz.common.tasks.initd.AdjustExpandRootScript)
if manifest.system['bootloader'] in ('grub', 'pvgrub'):
taskset.update([boot.AddXenGrubConsoleOutputDevice,
bootstrapvz.common.tasks.grub.WriteGrubConfig,
boot.UpdateGrubConfig])
if manifest.system['bootloader'] == 'pvgrub': if manifest.system['bootloader'] == 'pvgrub':
taskset.add(bootstrapvz.common.tasks.grub.AddGrubPackage) taskset.add(bootstrapvz.common.tasks.grub.AddGrubPackage)
taskset.update([bootstrapvz.common.tasks.grub.AddGrubPackage, taskset.update([bootstrapvz.common.tasks.grub.AddGrubPackage,