From: Peter Palfrader Date: Sat, 2 Sep 2017 15:03:46 +0000 (+0200) Subject: use ttyS1 on storace X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=a79817457c3e72965eb2ab19cdc021cdcaec45fb;p=mirror%2Fdsa-puppet.git use ttyS1 on storace --- diff --git a/modules/grub/templates/puppet-kernel-serial.cfg.erb b/modules/grub/templates/puppet-kernel-serial.cfg.erb index 55ff4a0cd..1f1c39513 100644 --- a/modules/grub/templates/puppet-kernel-serial.cfg.erb +++ b/modules/grub/templates/puppet-kernel-serial.cfg.erb @@ -4,6 +4,8 @@ GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyAMA0,115200n8" 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" +<%- elsif %w{storace}.include?(@hostname) then -%> +GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=tty0 console=ttyS1,115200n8" <% else -%> GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=tty0 console=ttyS0,115200n8" <%- end -%>