From 96086329e629f6edb83e24cee79e265e029a7f55 Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Wed, 8 Jun 2016 16:53:07 +0200 Subject: [PATCH] ec2: Only enable systemd when grub is the bootloader Right now we can only properly edit the linux bootparams, when using grub. This should be fixed so that it works for extlinux as well. Fixes #328 --- bootstrapvz/providers/ec2/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bootstrapvz/providers/ec2/__init__.py b/bootstrapvz/providers/ec2/__init__.py index 3dfe82e..89b1958 100644 --- a/bootstrapvz/providers/ec2/__init__.py +++ b/bootstrapvz/providers/ec2/__init__.py @@ -90,7 +90,8 @@ def resolve_tasks(taskset, manifest): taskset.add(tasks.tuning.SetCloudInitMountOptions) taskset.add(tasks.packages.AddWorkaroundGrowpart) taskset.add(initd.AdjustGrowpartWorkaround) - taskset.add(grub.EnableSystemd) + if manifest.system['bootloader'] == 'grub': + taskset.add(grub.EnableSystemd) if manifest.provider.get('install_init_scripts', True): taskset.add(tasks.initd.AddEC2InitScripts)