X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fgrub%2Ftemplates%2Fpuppet-kernel-serial.cfg.erb;h=f74449b26fb025288964f8148594031cead5035c;hb=e31d91af7a8a5d9b90bc309e38067605c00d7f13;hp=55ff4a0cdf32cc866b8c64f4b5195f8b15db3253;hpb=d07d87a1ec02405fa5fbf3514390eb5a706efce1;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 55ff4a0cd..f74449b26 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 arm-ubc-01 arm-ubc-02 arm-ubc-03 arm-ubc-04 arm-ubc-05 arm-ubc-06}.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" -<%- elsif %w{aagaard acker}.include?(@hostname) then -%> +<%- 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 casulana mirror-umn}.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 -%>