From 33b31f995863614e317749629b6ec2c038fec6d7 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Tue, 30 Aug 2022 17:05:07 +0200 Subject: [PATCH] coreos-base/oem-packet: Use i386 serial settings for x86_64 to fix m3 The m3.small.x86 instance type had no serial console output because ttyS0 was used because the GRUB CPU check didn't trigger. It seems that most instances had i386 reported but this new one not (maybe EFI is used here?). Extend the GRUB check to cover both i386 and x86_64 when setting up the serial console. For arm64 this still shouldn't be needed and the defaults worked so far. --- changelog/bugfixes/2022-08-30-equinix-metal-serial.md | 1 + coreos-base/oem-packet/files/grub.cfg | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog/bugfixes/2022-08-30-equinix-metal-serial.md diff --git a/changelog/bugfixes/2022-08-30-equinix-metal-serial.md b/changelog/bugfixes/2022-08-30-equinix-metal-serial.md new file mode 100644 index 00000000000..8443b27da8a --- /dev/null +++ b/changelog/bugfixes/2022-08-30-equinix-metal-serial.md @@ -0,0 +1 @@ +- Equinix Metal: Fixed serial console settings for the `m3.small.x86` instance by expanding the GRUB check for `i386` to `x86_64` [coreos-overlay#2122](https://github.com/flatcar-linux/coreos-overlay/pull/2122) diff --git a/coreos-base/oem-packet/files/grub.cfg b/coreos-base/oem-packet/files/grub.cfg index dbd914a92c9..f780fd76ec7 100644 --- a/coreos-base/oem-packet/files/grub.cfg +++ b/coreos-base/oem-packet/files/grub.cfg @@ -3,7 +3,7 @@ set oem_id="packet" set linux_append="flatcar.autologin" -if [ "$grub_cpu" = i386 ]; then +if [ "$grub_cpu" = i386 ] || [ "$grub_cpu" = x86_64 ]; then set gfxpayload="1024x768x8,1024x768" set linux_console="console=tty0 console=ttyS1,115200n8" fi