From 16fc92d933d20de37e161df8aaa2f5966495961c Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 18 Aug 2017 15:05:19 +0200 Subject: [PATCH] aagard, acker grub --- modules/grub/manifests/init.pp | 2 +- modules/grub/templates/puppet-kernel-serial.cfg.erb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/grub/manifests/init.pp b/modules/grub/manifests/init.pp index 1c9f2c965..a77c136d1 100644 --- a/modules/grub/manifests/init.pp +++ b/modules/grub/manifests/init.pp @@ -9,7 +9,7 @@ class grub { $grub_do_kernel_serial = true $grub_do_grub_serial = true $grub_do_nopat = true - } elsif $::hostname in [mirror-skroutz] { + } elsif $::hostname in [mirror-skroutz,aagard,acker] { $grub_manage = true $grub_do_kernel_serial = true $grub_do_grub_serial = true diff --git a/modules/grub/templates/puppet-kernel-serial.cfg.erb b/modules/grub/templates/puppet-kernel-serial.cfg.erb index 0a085efcb..4d03940fa 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{aagaard acker}.include?(hostname) then -%> +GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyS0,115200 earlycon" <% else -%> GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=tty0 console=ttyS0,115200n8" <%- end -%> -- 2.20.1