summaryrefslogtreecommitdiff
path: root/data/templates/grub
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2024-05-10 08:31:15 -0500
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-05-10 16:51:21 +0000
commit001b8207a0fbf41ecf90368c247f9145ac727422 (patch)
treee4eb61ec1734bb63150f72a8cc9a77276efa16c4 /data/templates/grub
parentd93aedfe993a6e9868ee88803c2dc981cabdfc15 (diff)
downloadvyos-1x-001b8207a0fbf41ecf90368c247f9145ac727422.tar.gz
vyos-1x-001b8207a0fbf41ecf90368c247f9145ac727422.zip
image-tools: T6327: drop boot console type ttyUSB
(cherry picked from commit 32658e981babffb5b7149534bd50a64d11f7c74f)
Diffstat (limited to 'data/templates/grub')
-rw-r--r--data/templates/grub/grub_compat.j24
-rw-r--r--data/templates/grub/grub_options.j26
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