From a5f5b9ef3af6dc775dd9b9b854276a2bba7248fc Mon Sep 17 00:00:00 2001
From: Anders Ingemann <anders@ingemann.de>
Date: Sat, 4 Jun 2016 19:26:31 +0200
Subject: [PATCH] ec2: Fix PVM grub console output

---
 bootstrapvz/providers/ec2/__init__.py   | 1 +
 bootstrapvz/providers/ec2/tasks/boot.py | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrapvz/providers/ec2/__init__.py b/bootstrapvz/providers/ec2/__init__.py
index 56ebca3..d436772 100644
--- a/bootstrapvz/providers/ec2/__init__.py
+++ b/bootstrapvz/providers/ec2/__init__.py
@@ -97,6 +97,7 @@ def resolve_tasks(taskset, manifest):
         taskset.update([grub.AddGrubPackage,
                         grub.InitGrubConfig,
                         grub.SetGrubTerminalToConsole,
+                        grub.SetGrubConsolOutputDeviceToSerial,
                         grub.RemoveGrubTimeout,
                         grub.DisableGrubRecovery,
                         tasks.boot.CreatePVGrubCustomRule,
diff --git a/bootstrapvz/providers/ec2/tasks/boot.py b/bootstrapvz/providers/ec2/tasks/boot.py
index 99510bb..7163fb8 100644
--- a/bootstrapvz/providers/ec2/tasks/boot.py
+++ b/bootstrapvz/providers/ec2/tasks/boot.py
@@ -69,7 +69,6 @@ class ConfigurePVGrub(Task):
     def run(cls, info):
         info.grub_config['GRUB_CMDLINE_LINUX'].extend([
             'consoleblank=0',
-            'console=hvc0',
             'elevator=noop',
         ])