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=8870379645b6295148f0a5568d69fc3d113260c8;hpb=ba515449d9714ad0fc8be312c1b420a31715dcd3;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 887037964..d2f752e6c 100644 --- a/modules/grub/templates/puppet-kernel-serial.cfg.erb +++ b/modules/grub/templates/puppet-kernel-serial.cfg.erb @@ -1,4 +1,4 @@ -<%- if %w{amdahl 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 -%> GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyS0,115200"