From e119ed0c2dc49e398e41a6c5eff85fe934cc4054 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 30 Jun 2025 08:50:02 +0200 Subject: [PATCH] grub/installer: add console=tty1 to default entry this is needed because some arm systems try to set more than one console output via firmware/dtb and this is incompatible with the old initsystem that ipfire use. Signed-off-by: Arne Fitzenreiter --- config/cdrom/grub.cfg | 6 +++--- config/grub2/default | 2 +- config/rootfiles/core/196/filelists/files | 1 + src/initscripts/system/partresize | 2 +- src/installer/main.c | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/config/cdrom/grub.cfg b/config/cdrom/grub.cfg index 1388ec691f..d5d3524e0e 100644 --- a/config/cdrom/grub.cfg +++ b/config/cdrom/grub.cfg @@ -17,18 +17,18 @@ insmod ext2 set timeout=60 menuentry 'Install NAME VERSION ARCH' --class ipfire --class gnu-linux --class gnu --class os { - linux /boot/isolinux/vmlinuz + linux /boot/isolinux/vmlinuz console=tty1 initrd /boot/isolinux/instroot } submenu 'Other Installation Options -->' { menuentry 'Install NAME VERSION (Text Mode)' --class ipfire --class gnu-linux --class gnu --class os { - linux /boot/isolinux/vmlinuz nomodeset novga + linux /boot/isolinux/vmlinuz console=tty1 nomodeset novga initrd /boot/isolinux/instroot } menuentry 'Unattended installation' --class ipfire --class gnu-linux --class gnu --class os { - linux /boot/isolinux/vmlinuz installer.unattended + linux /boot/isolinux/vmlinuz console=tty1 installer.unattended initrd /boot/isolinux/instroot } } diff --git a/config/grub2/default b/config/grub2/default index 127d334454..32abf0f8bc 100644 --- a/config/grub2/default +++ b/config/grub2/default @@ -1,6 +1,6 @@ GRUB_TIMEOUT=5 GRUB_DISTRIBUTOR="$(sed 's, release .*$,,g' /etc/system-release)" GRUB_DEFAULT=saved -GRUB_CMDLINE_LINUX="rd.auto panic=10" +GRUB_CMDLINE_LINUX="rd.auto panic=10 console=tty1" GRUB_DISABLE_RECOVERY="true" GRUB_BACKGROUND="/boot/grub/splash.png" diff --git a/config/rootfiles/core/196/filelists/files b/config/rootfiles/core/196/filelists/files index d760f7190a..1d83bafb51 100644 --- a/config/rootfiles/core/196/filelists/files +++ b/config/rootfiles/core/196/filelists/files @@ -1,4 +1,5 @@ etc/rc.d/init.d/networking/red +etc/rc.d/init.d/partresize etc/rc.d/init.d/wireguard srv/web/ipfire/cgi-bin/firewall.cgi srv/web/ipfire/cgi-bin/fwhosts.cgi diff --git a/src/initscripts/system/partresize b/src/initscripts/system/partresize index 832bc7237f..44c5d93071 100644 --- a/src/initscripts/system/partresize +++ b/src/initscripts/system/partresize @@ -87,7 +87,7 @@ case "${1}" in # Enable also serial console on GRUB echo "GRUB_TERMINAL=\"serial console\"" >> /etc/default/grub echo "GRUB_SERIAL_COMMAND=\"serial --unit=0 --speed=115200\"" >> /etc/default/grub - sed -i -e "s|panic=10|& console=ttyS0,115200n8|g" /etc/default/grub + sed -i -e "s|console=tty1|console=ttyS0,115200n8|g" /etc/default/grub fi # Re-generate GRUB configuration diff --git a/src/installer/main.c b/src/installer/main.c index 9b9c630c35..ee5e056375 100644 --- a/src/installer/main.c +++ b/src/installer/main.c @@ -789,7 +789,7 @@ int main(int argc, char *argv[]) { fprintf(f, "GRUB_SERIAL_COMMAND=\"serial --unit=0 --speed=%d\"\n", SERIAL_BAUDRATE); fclose(f); - replace(DESTINATION_MOUNT_PATH "/etc/default/grub", "panic=10", "panic=10 console=ttyS0,115200n8"); + replace(DESTINATION_MOUNT_PATH "/etc/default/grub", "console=tty1", "console=ttyS0,115200n8"); } /* novga */ -- 2.47.3