diff options
| author | John Estabrook <jestabro@vyos.io> | 2024-05-10 12:11:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-10 12:11:14 -0500 |
| commit | f3d7e453236948ff590afd735903d1a7238cea5b (patch) | |
| tree | 76ffe1db2c74e5935005acf968df1e10bdb03282 /data | |
| parent | d93aedfe993a6e9868ee88803c2dc981cabdfc15 (diff) | |
| parent | 2fa4014d2f4e1f65dfb2be57177a2185e804fc1b (diff) | |
| download | vyos-1x-f3d7e453236948ff590afd735903d1a7238cea5b.tar.gz vyos-1x-f3d7e453236948ff590afd735903d1a7238cea5b.zip | |
Merge pull request #3444 from vyos/mergify/bp/sagitta/pr-3443
image-tools: T6176: fixes for boot console (backport #3443)
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 |