From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 18 Aug 2017 13:02:00 +0000 (+0200)
Subject: Use ttyAMA0 based on hostname instead of arch
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=56e59e695d67665c4983de22b8a3864a192817d9;p=mirror%2Fdsa-puppet.git

Use ttyAMA0 based on hostname instead of arch
---

diff --git a/modules/grub/templates/puppet-kernel-serial.cfg.erb b/modules/grub/templates/puppet-kernel-serial.cfg.erb
index 4b5026d90..0a085efcb 100644
--- a/modules/grub/templates/puppet-kernel-serial.cfg.erb
+++ b/modules/grub/templates/puppet-kernel-serial.cfg.erb
@@ -1,4 +1,4 @@
-<%- if scope.lookupvar('::debarchitecture') == "arm64" -%>
+<%- if %w{arm-conova-01 arm-arm-01}.include?(hostname) then -%>
 GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyAMA0,115200n8"
 <% else -%>
 GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=tty0 console=ttyS0,115200n8"