X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fgrub%2Ftemplates%2Fpuppet-kernel-serial.cfg.erb;h=d2f752e6cf09617c78259b0682d26f0225592a92;hb=3b439e9aa0cd3647f96ba298d3b07bccb7e4a511;hp=f35ad04b78495434c46f259395613324d748ba5d;hpb=c11a78bacd6ddabf14ac16338c36a4dc5634a811;p=mirror%2Fdsa-puppet.git diff --git a/modules/grub/templates/puppet-kernel-serial.cfg.erb b/modules/grub/templates/puppet-kernel-serial.cfg.erb index f35ad04b7..d2f752e6c 100644 --- a/modules/grub/templates/puppet-kernel-serial.cfg.erb +++ b/modules/grub/templates/puppet-kernel-serial.cfg.erb @@ -1,9 +1,11 @@ -<%- if %w{arm-conova-01 arm-arm-01}.include?(hostname) then -%> +<%- if %w{amdahl arm-conova-01 arm-conova-02 arm-arm-01}.include?(@hostname) then -%> GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyAMA0,115200n8" -<%- elsif %w{arm-arm-03}.include?(hostname) then -%> +<%- elsif %w{arm-arm-03}.include?(@hostname) then -%> GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyS0,115200" -<%- elsif %w{aagaard acker}.include?(hostname) then -%> +<%- 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 -%>