From c11a78bacd6ddabf14ac16338c36a4dc5634a811 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 18 Aug 2017 15:32:41 +0200 Subject: [PATCH] manage grub on arm-arm-03 --- modules/grub/manifests/init.pp | 5 +++++ modules/grub/templates/puppet-kernel-serial.cfg.erb | 2 ++ 2 files changed, 7 insertions(+) diff --git a/modules/grub/manifests/init.pp b/modules/grub/manifests/init.pp index 4a55bba17..74fb539da 100644 --- a/modules/grub/manifests/init.pp +++ b/modules/grub/manifests/init.pp @@ -14,6 +14,11 @@ class grub { $grub_do_kernel_serial = true $grub_do_grub_serial = true $grub_do_nopat = false + } elsif $::hostname in [acker,arm-arm-03] { + $grub_manage = true + $grub_do_kernel_serial = true + $grub_do_grub_serial = false + $grub_do_nopat = false } else { $grub_manage = false } diff --git a/modules/grub/templates/puppet-kernel-serial.cfg.erb b/modules/grub/templates/puppet-kernel-serial.cfg.erb index 4d03940fa..f35ad04b7 100644 --- a/modules/grub/templates/puppet-kernel-serial.cfg.erb +++ b/modules/grub/templates/puppet-kernel-serial.cfg.erb @@ -1,5 +1,7 @@ <%- if %w{arm-conova-01 arm-arm-01}.include?(hostname) then -%> GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyAMA0,115200n8" +<%- elsif %w{arm-arm-03}.include?(hostname) then -%> +GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyS0,115200" <%- elsif %w{aagaard acker}.include?(hostname) then -%> GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyS0,115200 earlycon" <% else -%> -- 2.20.1