X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fgrub%2Ftemplates%2Fpuppet-grub-serial.cfg.erb;h=6d43cbd6de219dd4aaf3629102b951ef802d2c82;hb=8de5a6e04165cf8b64e2b3f582484236864f0e27;hp=42597a9d76ae54541292dcf4ef36b040cc6d52fa;hpb=a640453031f7f590851d8e0f27fb3de39be2801a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/grub/templates/puppet-grub-serial.cfg.erb b/modules/grub/templates/puppet-grub-serial.cfg.erb
index 42597a9d7..6d43cbd6d 100644
--- a/modules/grub/templates/puppet-grub-serial.cfg.erb
+++ b/modules/grub/templates/puppet-grub-serial.cfg.erb
@@ -1,8 +1,6 @@
-<%- if scope.lookupvar('::debarchitecture') == "arm64" -%>
-GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyAMA0,115200n8"
-<% else -%>
-GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=tty0 console=ttyS0,115200n8"
-<%- end -%>
-
 GRUB_TERMINAL="serial console"
+<%- if %w{storace klecker clementi czerny}.include?(@hostname) then -%>
+GRUB_SERIAL_COMMAND="serial --unit=1 --speed=115200 --word=8 --parity=no --stop=1"
+<% else -%>
 GRUB_SERIAL_COMMAND="serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1"
+<% end -%>