X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fgrub%2Ftemplates%2Fpuppet-kernel-serial.cfg.erb;h=c8832e15a5991d8c2eaa0df8060337109b8c71e7;hb=a3602762e8a1122180fd557284f7e78875ea89ec;hp=ad9a23ec5fb79e36861ef92ac3583b4e9f58794c;hpb=cab180610e24bb0b6b632aa947eb1d93c95e5379;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 ad9a23ec5..c8832e15a 100644 --- a/modules/grub/templates/puppet-kernel-serial.cfg.erb +++ b/modules/grub/templates/puppet-kernel-serial.cfg.erb @@ -1,10 +1,10 @@ -<%- if %w{amdahl arm-conova-01 arm-conova-02 arm-arm-01 arm-ubc-01 arm-ubc-02 arm-ubc-03 arm-ubc-04}.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{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 -%> +<%- elsif %w{storace fasolo klecker clementi czerny casulana mirror-umn csail-node01 csail-node02}.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"