summaryrefslogtreecommitdiff
path: root/data/templates/grub/grub_compat.j2
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2024-01-16 22:54:20 +0000
committerGitHub <noreply@github.com>2024-01-16 22:54:20 +0000
commitbf08f0f2538b5068ff1a41b51dac832b04a7d4be (patch)
treec8b8babd8e5d812a0f323dd40c1b1689c4530dde /data/templates/grub/grub_compat.j2
parent0249dc59b5adf095d9833cde42d8649ad299d717 (diff)
parent5ceaff2ef970cb9c567ac317bafbffca5b073f4a (diff)
downloadvyos-1x-bf08f0f2538b5068ff1a41b51dac832b04a7d4be.tar.gz
vyos-1x-bf08f0f2538b5068ff1a41b51dac832b04a7d4be.zip
Merge pull request #2818 from jestabro/serial-console-config-mode
image-tools: T5923: update system_console.py for new GRUB file structure
Diffstat (limited to 'data/templates/grub/grub_compat.j2')
-rw-r--r--data/templates/grub/grub_compat.j212
1 files changed, 8 insertions, 4 deletions
diff --git a/data/templates/grub/grub_compat.j2 b/data/templates/grub/grub_compat.j2
index 887d5d0bd..d1085eec8 100644
--- a/data/templates/grub/grub_compat.j2
+++ b/data/templates/grub/grub_compat.j2
@@ -22,13 +22,13 @@
{%- endmacro %}
{% macro console_opts(type) -%}
{% if type == 'tty' -%}
- console=ttyS0,115200 console=tty0
+ console=ttyS0,{{ console_speed }} console=tty0
{%- elif type == 'ttyS' -%}
- console=tty0 console=ttyS0,115200
+ console=tty0 console=ttyS0,{{ console_speed }}
{%- elif type == 'ttyUSB' -%}
console=tty0 console=ttyUSB0,115200
{%- else -%}
- console=tty0 console=ttyS0,115200
+ console=tty0 console=ttyS0,{{ console_speed }}
{%- endif %}
{%- endmacro %}
{% macro passwd_opts(mode) -%}
@@ -39,9 +39,13 @@
set default={{ default }}
set timeout={{ timeout }}
{% if console_type == 'ttyS' %}
+{% if console_num == '0' %}
+serial --unit=0 --speed={{ console_speed }}
+{% else %}
serial --unit={{ console_num }} --speed=115200
+{% endif %}
{% else %}
-serial --unit=0 --speed=115200
+serial --unit=0 --speed={{ console_speed }}
{% endif %}
terminal_output --append serial
terminal_input serial console