X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fgrub%2Ftemplates%2Fpuppet-kernel-serial.cfg.erb;h=b22cfdeb4487fbd938e825e5d663a5c5fb3fa8fe;hb=70091d4278b3b614652c8ef99dc692e89bc28967;hp=c8832e15a5991d8c2eaa0df8060337109b8c71e7;hpb=1051821c84ea947a48ab3aa3f032785e4ca29693;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 c8832e15a..b22cfdeb4 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 casulana mirror-umn csail-node01 csail-node02}.include?(@hostname) then -%> +<%- elsif %w{storace fasolo 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"