JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

grub: if serialcon is not a tty0 or tty1, include a console=tty0 as first console

Browse Source 
- that way one can still get last-resort non-serial console if the serial fails
This commit is contained in:
Ricardo Pardini
2025-05-25 09:29:48 +02:00
committed by Igor
parent 03c47689cb
commit 9a971ded79
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/grub.sh
View File

@@ -247,6 +247,13 @@ pre_umount_final_image__900_export_kernel_and_initramfs() {
} }
configure_grub() { 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" ]] && [[ -n "$SERIALCON" ]] &&
GRUB_CMDLINE_LINUX_DEFAULT+=" console=${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 run_host_command_logged chmod -v +x "${MOUNT}"/usr/share/desktop-base/grub_background.sh
fi 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 cat <<- grubCfgFrag >> "${MOUNT}"/etc/default/grub.d/98-armbian.cfg
GRUB_CMDLINE_LINUX_DEFAULT="${GRUB_CMDLINE_LINUX_DEFAULT}" GRUB_CMDLINE_LINUX_DEFAULT="${GRUB_CMDLINE_LINUX_DEFAULT}"
GRUB_TIMEOUT_STYLE=menu # Show the menu with Kernel options (Armbian or -generic)... GRUB_TIMEOUT_STYLE=menu # Show the menu with Kernel options (Armbian or -generic)...