diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-05-10 18:50:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-10 18:50:10 +0200 |
| commit | d0bfe6ddb92f4a0e3d19c26eb475cbc42f946480 (patch) | |
| tree | 38bf27c7da5ee0d9bc4bedea93983d75ad2f800a /data | |
| parent | def74a8fa4e0fb9c7ef95bfb6daff8a4f1a9878f (diff) | |
| parent | 428d03e47e7d01b08ccb8cf1acc0ab8a53275286 (diff) | |
| download | vyos-1x-d0bfe6ddb92f4a0e3d19c26eb475cbc42f946480.tar.gz vyos-1x-d0bfe6ddb92f4a0e3d19c26eb475cbc42f946480.zip | |
Merge pull request #3443 from jestabro/fix-boot-console
image-tools: T6176: fixes for boot console
Diffstat (limited to 'data')
| -rw-r--r-- | data/templates/grub/grub_compat.j2 | 4 | ||||
| -rw-r--r-- | data/templates/grub/grub_options.j2 | 6 |
2 files changed, 0 insertions, 10 deletions
diff --git a/data/templates/grub/grub_compat.j2 b/data/templates/grub/grub_compat.j2 index d1085eec8..8fb4f71dc 100644 --- a/data/templates/grub/grub_compat.j2 +++ b/data/templates/grub/grub_compat.j2 @@ -14,8 +14,6 @@ KVM {%- elif type == 'ttyS' -%} Serial -{%- elif type == 'ttyUSB' -%} - USB {%- else -%} Unknown {%- endif %} @@ -25,8 +23,6 @@ console=ttyS0,{{ console_speed }} console=tty0 {%- elif type == 'ttyS' -%} console=tty0 console=ttyS0,{{ console_speed }} -{%- elif type == 'ttyUSB' -%} - console=tty0 console=ttyUSB0,115200 {%- else -%} console=tty0 console=ttyS0,{{ console_speed }} {%- endif %} diff --git a/data/templates/grub/grub_options.j2 b/data/templates/grub/grub_options.j2 index c8a1472e1..a00bf4e37 100644 --- a/data/templates/grub/grub_options.j2 +++ b/data/templates/grub/grub_options.j2 @@ -33,12 +33,6 @@ submenu "Boot options" { setup_serial configfile ${prefix}/grub.cfg.d/*vyos-menu*.cfg } - menuentry "ttyUSB (USB serial)" { - set console_type="ttyUSB" - export console_type - setup_serial - configfile ${prefix}/grub.cfg.d/*vyos-menu*.cfg - } } menuentry "Enter console number" { read console_num |