From 5f44786c4370a77b7724df474b017c19914d99e3 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 29 Apr 2021 16:30:41 +0200 Subject: installer: grub: merge serial/gfx boot entries - drop our class override that basically reverted the boot menu entry order and used to make serial the first (default) boot entry instead of graphical; - unset GRUB_GFXSERIAL that creates 2 boot entries instead of one; - extend APPEND to contain both tty0 (graphical) and ttyS0 (serial): * ttyS0 is last, so it has priority for selection as /dev/console; Change-Id: I9be029bfea00d9aca61527046fedbe30e7ec58c2 Signed-off-by: Alexandru Avadanii --- images/enea-nfv-access-host-common.inc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'images') diff --git a/images/enea-nfv-access-host-common.inc b/images/enea-nfv-access-host-common.inc index c91e1e7..c096600 100644 --- a/images/enea-nfv-access-host-common.inc +++ b/images/enea-nfv-access-host-common.inc @@ -2,7 +2,6 @@ IMAGE_FSTYPES += "hddimg" REQUIRE_FILES = " \ images/enea-nfv-access-common.inc \ - classes/override_grub-efi-cfg.inc \ " REQUIRE_FILES_append_df-efi-secure-boot = " \ classes/override_live-vm-common.inc \ @@ -19,9 +18,8 @@ IMAGE_INSTALL += " \ # Set labels for GRUB and SYSLINUX LABELS_LIVE = "installer live-boot" -GRUB_GFXSERIAL_x86-64 = "1" # Append default parameters for x86-64 targets -APPEND_x86-64 = "quiet" +APPEND_x86-64 = "quiet console=tty0 console=ttyS0,115200" SYSLINUX_DEFAULT_CONSOLE_x86-64 = "console=ttyS0,115200" # Skip menu and boot installer immediately -- cgit v1.2.3-54-g00ecf