From: Peter Palfrader Date: Fri, 9 Feb 2018 20:23:28 +0000 (+0100) Subject: use ttyS1 for the serial console on casulana X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=3b29c4516cf2a90765ee8a2609157e502c4f7182;p=mirror%2Fdsa-puppet.git use ttyS1 for the serial console on casulana --- diff --git a/modules/grub/templates/puppet-kernel-serial.cfg.erb b/modules/grub/templates/puppet-kernel-serial.cfg.erb index 0bd187c03..d87090fe9 100644 --- a/modules/grub/templates/puppet-kernel-serial.cfg.erb +++ b/modules/grub/templates/puppet-kernel-serial.cfg.erb @@ -4,7 +4,7 @@ GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyAMA0,115200n8" GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyS0,115200" <%- elsif %w{conova-node01 conova-node02}.include?(@hostname) then -%> GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyS0,115200 earlycon" -<%- elsif %w{storace fasolo klecker clementi czerny}.include?(@hostname) then -%> +<%- elsif %w{storace fasolo klecker clementi czerny casulana}.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"