From 7613eac3fd982b5395cc32b5867c0e30fc02da40 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Wed, 9 Aug 2017 00:36:34 +0200 Subject: [PATCH] /etc/default/grub: fix serial console on arm64 VMs arm64 VMs do not have a graphical card and have their serial device named ttyAMA0. Signed-off-by: Aurelien Jarno --- modules/grub/manifests/init.pp | 2 +- .../etc-default-grub => templates/etc-default-grub.erb} | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) rename modules/grub/{files/etc-default-grub => templates/etc-default-grub.erb} (91%) diff --git a/modules/grub/manifests/init.pp b/modules/grub/manifests/init.pp index dab3d56a3..eab53d414 100644 --- a/modules/grub/manifests/init.pp +++ b/modules/grub/manifests/init.pp @@ -1,7 +1,7 @@ class grub { if ($::kernel == 'Linux' and $::is_virtual and $::virtual == 'kvm') { file { '/etc/default/grub': - source => 'puppet:///modules/grub/etc-default-grub', + content => template('grub/etc-default-grub.erb'), notify => Exec['update-grub'] } diff --git a/modules/grub/files/etc-default-grub b/modules/grub/templates/etc-default-grub.erb similarity index 91% rename from modules/grub/files/etc-default-grub rename to modules/grub/templates/etc-default-grub.erb index d5536d9de..f12b89d30 100644 --- a/modules/grub/files/etc-default-grub +++ b/modules/grub/templates/etc-default-grub.erb @@ -7,7 +7,11 @@ GRUB_DEFAULT=0 GRUB_TIMEOUT=5 GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian` GRUB_CMDLINE_LINUX_DEFAULT="quiet" +<%- if scope.lookupvar('::debarchitecture') == "arm64" -%> +GRUB_CMDLINE_LINUX="console=ttyAMA0,115200n8" +<% else -%> GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8" +<%- end -%> # Uncomment to enable BadRAM filtering, modify to suit your needs # This works with Linux (no patch required) and with any kernel that obtains -- 2.20.1