mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-17 18:06:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

coreos-base/oem-azure: refactor grub.cfg to apply console override only on PC

Browse Source 
We always want the 'flatcar.autologin' parameter, but the ttyS0 setting is x86
PC specific. Move the generic part to linux_append variable and hide the
generic part behind a check for grub_platform. For EFI platforms the default
grub.cfg has the correct arch specific console configuration.

The console specification for grub itself is needed in either case

Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
This commit is contained in:
Jeremi Piotrowski 2021-08-23 16:24:24 +00:00
parent 26bd80f6f0
commit 20be55473f
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure-pro/files/grub.cfg vendored
View File

@ -2,8 +2,13 @@
set oem_id="azure" set oem_id="azure"
set linux_append="flatcar.autologin"
# Azure only has a serial console. # Azure only has a serial console.
set linux_console="console=ttyS0,115200n8 earlyprintk=ttyS0,115200 flatcar.autologin"
serial com0 --speed=115200 --word=8 --parity=no serial com0 --speed=115200 --word=8 --parity=no
terminal_input serial_com0 terminal_input serial_com0
terminal_output serial_com0 terminal_output serial_com0
if [ "$grub_platform" = "pc" ]; then
set linux_console="console=ttyS0,115200n8 earlyprintk=ttyS0,115200"
fi

7
sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/grub.cfg vendored
View File

@ -2,8 +2,13 @@
set oem_id="azure" set oem_id="azure"
set linux_append="flatcar.autologin"
# Azure only has a serial console. # Azure only has a serial console.
set linux_console="console=ttyS0,115200n8 earlyprintk=ttyS0,115200 flatcar.autologin"
serial com0 --speed=115200 --word=8 --parity=no serial com0 --speed=115200 --word=8 --parity=no
terminal_input serial_com0 terminal_input serial_com0
terminal_output serial_com0 terminal_output serial_com0
if [ "$grub_platform" = "pc" ]; then
set linux_console="console=ttyS0,115200n8 earlyprintk=ttyS0,115200"
fi