From: Aurelien Jarno Date: Sun, 9 Jun 2019 20:51:36 +0000 (+0200) Subject: Use ttyAMA0 on arm-ubc-0X X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=fb80480f06c4e200a85203bf2dfdcd433d8a4d4b;hp=cb99d997e736f428f4f1264a0894e30b5302ef3d;p=mirror%2Fdsa-puppet.git Use ttyAMA0 on arm-ubc-0X --- diff --git a/modules/grub/templates/puppet-kernel-serial.cfg.erb b/modules/grub/templates/puppet-kernel-serial.cfg.erb index 15daa2e37..5fc1fee47 100644 --- a/modules/grub/templates/puppet-kernel-serial.cfg.erb +++ b/modules/grub/templates/puppet-kernel-serial.cfg.erb @@ -1,4 +1,4 @@ -<%- if %w{amdahl arm-conova-01 arm-conova-02 arm-arm-01}.include?(@hostname) then -%> +<%- if %w{amdahl arm-conova-01 arm-conova-02 arm-arm-01 arm-ubc-01 arm-ubc-02 arm-ubc-03}.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"