summaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2021-04-29 16:30:41 +0200
committerAdrian Calianu <Adrian.Calianu@enea.com>2021-05-21 17:17:02 +0200
commit5f44786c4370a77b7724df474b017c19914d99e3 (patch)
tree952210cba77a8c51309990d835068edb1d9824c2 /images
parent5987e0c051babe954238f0bce420d06da5b04b74 (diff)
downloadmeta-el-nfv-access-5f44786c4370a77b7724df474b017c19914d99e3.tar.gz
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 <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'images')
-rw-r--r--images/enea-nfv-access-host-common.inc4
1 files changed, 1 insertions, 3 deletions
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"
2 2
3REQUIRE_FILES = " \ 3REQUIRE_FILES = " \
4 images/enea-nfv-access-common.inc \ 4 images/enea-nfv-access-common.inc \
5 classes/override_grub-efi-cfg.inc \
6 " 5 "
7REQUIRE_FILES_append_df-efi-secure-boot = " \ 6REQUIRE_FILES_append_df-efi-secure-boot = " \
8 classes/override_live-vm-common.inc \ 7 classes/override_live-vm-common.inc \
@@ -19,9 +18,8 @@ IMAGE_INSTALL += " \
19# Set labels for GRUB and SYSLINUX 18# Set labels for GRUB and SYSLINUX
20LABELS_LIVE = "installer live-boot" 19LABELS_LIVE = "installer live-boot"
21 20
22GRUB_GFXSERIAL_x86-64 = "1"
23# Append default parameters for x86-64 targets 21# Append default parameters for x86-64 targets
24APPEND_x86-64 = "quiet" 22APPEND_x86-64 = "quiet console=tty0 console=ttyS0,115200"
25SYSLINUX_DEFAULT_CONSOLE_x86-64 = "console=ttyS0,115200" 23SYSLINUX_DEFAULT_CONSOLE_x86-64 = "console=ttyS0,115200"
26 24
27# Skip menu and boot installer immediately 25# Skip menu and boot installer immediately