From 9a971ded79e0bbce188e97ca9f3eabbe92d2c2a0 Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <ricardo@pardini.net>
Date: Sun, 25 May 2025 09:29:48 +0200
Subject: [PATCH] grub: if serialcon is not a tty0 or tty1, include a
 console=tty0 as first console

- that way one can still get last-resort non-serial console if the serial fails
---
 extensions/grub.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/extensions/grub.sh b/extensions/grub.sh
index 563e70b4d..bab94d514 100644
--- a/extensions/grub.sh
+++ b/extensions/grub.sh
@@ -247,6 +247,13 @@ pre_umount_final_image__900_export_kernel_and_initramfs() {
 }
 
 configure_grub() {
+	display_alert "Extension: ${EXTENSION}: Configuring GRUB" "UEFI GRUB; SERIALCON=${SERIALCON}" "info"
+
+	# If SERIALCON is _not_ tty1 or tty0, include a console=tty0 first.
+	if [[ "${SERIALCON}" != "tty1" && "${SERIALCON}" != "tty0" ]]; then
+		GRUB_CMDLINE_LINUX_DEFAULT+=" console=tty0"
+	fi
+
 	[[ -n "$SERIALCON" ]] &&
 		GRUB_CMDLINE_LINUX_DEFAULT+=" console=${SERIALCON}"
 
@@ -266,7 +273,7 @@ configure_grub() {
 		run_host_command_logged chmod -v +x "${MOUNT}"/usr/share/desktop-base/grub_background.sh
 	fi
 
-	display_alert "Extension: ${EXTENSION}: GRUB EFI kernel cmdline" "${GRUB_CMDLINE_LINUX_DEFAULT} distro=${UEFI_GRUB_DISTRO_NAME} timeout=${UEFI_GRUB_TIMEOUT}" ""
+	display_alert "Extension: ${EXTENSION}: GRUB EFI kernel cmdline" "cmdline '${GRUB_CMDLINE_LINUX_DEFAULT}' distro=${UEFI_GRUB_DISTRO_NAME} timeout=${UEFI_GRUB_TIMEOUT}" ""
 	cat <<- grubCfgFrag >> "${MOUNT}"/etc/default/grub.d/98-armbian.cfg
 		GRUB_CMDLINE_LINUX_DEFAULT="${GRUB_CMDLINE_LINUX_DEFAULT}"
 		GRUB_TIMEOUT_STYLE=menu                                  # Show the menu with Kernel options (Armbian or -generic)...