From 70122bef58eaa0084695f89c410992f8d7c1f9f6 Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Thu, 11 Jan 2024 10:34:06 -0600
Subject: image-tools: T5910: explicitly set transmission speed of serial
 console

GRUB defaults to 9600 in case of serial console; explicitly set to
115200.
---
 data/templates/grub/grub_common.j2       |  4 ++--
 data/templates/grub/grub_vyos_version.j2 | 11 ++++++++---
 src/op_mode/image_installer.py           |  1 +
 src/system/grub_update.py                |  3 ++-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/data/templates/grub/grub_common.j2 b/data/templates/grub/grub_common.j2
index 278ffbf2c..29c2ab879 100644
--- a/data/templates/grub/grub_common.j2
+++ b/data/templates/grub/grub_common.j2
@@ -8,9 +8,9 @@ fi
 function setup_serial {
     # initialize the first serial port by default
     if [ "${console_type}" == "ttyS" ]; then
-        serial --unit=${console_num}
+        serial --unit=${console_num} --speed=${console_speed}
     else
-        serial --unit=0
+        serial --unit=0 --speed=${console_speed}
     fi
     terminal_output --append serial console
     terminal_input --append serial console
diff --git a/data/templates/grub/grub_vyos_version.j2 b/data/templates/grub/grub_vyos_version.j2
index 97fbe8473..62688e68b 100644
--- a/data/templates/grub/grub_vyos_version.j2
+++ b/data/templates/grub/grub_vyos_version.j2
@@ -6,16 +6,21 @@
 {% endif %}
 menuentry "{{ version_name }}" --id {{ version_uuid }} {
     set boot_opts="{{ boot_opts_rendered }}"
+    if [ "${console_type}" == "ttyS" ]; then
+        set console_opts="console=${console_type}${console_num},${console_speed}"
+    else
+        set console_opts="console=${console_type}${console_num}"
+    fi
     # load rootfs to RAM
     if [ "${boot_toram}" == "yes" ]; then
         set boot_opts="${boot_opts} toram"
     fi
     if [ "${bootmode}" == "pw_reset" ]; then
-        set boot_opts="${boot_opts} console=${console_type}${console_num} init=/usr/libexec/vyos/system/standalone_root_pw_reset"
+        set boot_opts="${boot_opts} ${console_opts} init=/usr/libexec/vyos/system/standalone_root_pw_reset"
     elif [ "${bootmode}" == "recovery" ]; then
-        set boot_opts="${boot_opts} console=${console_type}${console_num} init=/usr/bin/busybox init"
+        set boot_opts="${boot_opts} ${console_opts} init=/usr/bin/busybox init"
     else
-        set boot_opts="${boot_opts} console=${console_type}${console_num}"
+        set boot_opts="${boot_opts} ${console_opts}"
     fi
     linux "/boot/{{ version_name }}/vmlinuz" ${boot_opts}
     initrd "/boot/{{ version_name }}/initrd.img"
diff --git a/src/op_mode/image_installer.py b/src/op_mode/image_installer.py
index 791d76718..fad6face7 100755
--- a/src/op_mode/image_installer.py
+++ b/src/op_mode/image_installer.py
@@ -93,6 +93,7 @@ DEFAULT_BOOT_VARS: dict[str, str] = {
     'timeout': '5',
     'console_type': 'tty',
     'console_num': '0',
+    'console_speed': '115200',
     'bootmode': 'normal'
 }
 
diff --git a/src/system/grub_update.py b/src/system/grub_update.py
index 3c851f0e0..4d5e0b6ae 100644
--- a/src/system/grub_update.py
+++ b/src/system/grub_update.py
@@ -68,7 +68,8 @@ if __name__ == '__main__':
         'default': grub.gen_version_uuid(default_entry['version']),
         'bootmode': default_entry['bootmode'],
         'console_type': default_entry['console_type'],
-        'console_num': default_entry['console_num']
+        'console_num': default_entry['console_num'],
+        'console_speed': '115200'
     }
     vars.update(default_settings)
 
-- 
cgit v1.2.3