From 5f44786c4370a77b7724df474b017c19914d99e3 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
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 <Alexandru.Avadanii@enea.com>
---
 classes/override_grub-efi-cfg.inc      | 94 ----------------------------------
 images/enea-nfv-access-host-common.inc |  4 +-
 2 files changed, 1 insertion(+), 97 deletions(-)
 delete mode 100644 classes/override_grub-efi-cfg.inc

diff --git a/classes/override_grub-efi-cfg.inc b/classes/override_grub-efi-cfg.inc
deleted file mode 100644
index 42d89b7..0000000
--- a/classes/override_grub-efi-cfg.inc
+++ /dev/null
@@ -1,94 +0,0 @@
-## ENEA_start ##
-GRUB_GRAPHICS ?= "console=tty0"
-## ENEA_end ##
-
-python build_efi_cfg() {
-    import sys
-
-    workdir = d.getVar('WORKDIR')
-    if not workdir:
-        bb.error("WORKDIR not defined, unable to package")
-        return
-
-    gfxserial = d.getVar('GRUB_GFXSERIAL') or ""
-
-    labels = d.getVar('LABELS')
-    if not labels:
-        bb.debug(1, "LABELS not defined, nothing to do")
-        return
-
-    if labels == []:
-        bb.debug(1, "No labels, nothing to do")
-        return
-
-    cfile = d.getVar('GRUB_CFG')
-    if not cfile:
-        bb.fatal('Unable to read GRUB_CFG')
-
-    try:
-         cfgfile = open(cfile, 'w')
-    except OSError:
-        bb.fatal('Unable to open %s' % cfile)
-
-    cfgfile.write('# Automatically created by OE\n')
-
-    opts = d.getVar('GRUB_OPTS')
-    if opts:
-        for opt in opts.split(';'):
-            cfgfile.write('%s\n' % opt)
-
-    cfgfile.write('default=%s\n' % (labels.split()[0]))
-
-    timeout = d.getVar('GRUB_TIMEOUT')
-    if timeout:
-        cfgfile.write('timeout=%s\n' % timeout)
-    else:
-        cfgfile.write('timeout=50\n')
-
-    root = d.getVar('GRUB_ROOT')
-    if not root:
-        bb.fatal('GRUB_ROOT not defined')
-
-    if gfxserial == "1":
-        ## ENEA_start ##
-        btypes = [ [ " serial console", d.getVar('GRUB_SERIAL') or "" ],
-            [ " graphics console", d.getVar('GRUB_GRAPHICS') or "" ] ]
-        ## ENEA_end ##
-    else:
-        btypes = [ [ "", "" ] ]
-
-    for label in labels.split():
-        localdata = d.createCopy()
-
-        overrides = localdata.getVar('OVERRIDES')
-        if not overrides:
-            bb.fatal('OVERRIDES not defined')
-
-        localdata.setVar('OVERRIDES', 'grub_' + label + ':' + overrides)
-
-        for btype in btypes:
-            cfgfile.write('\nmenuentry \'%s%s\'{\n' % (label, btype[0]))
-            lb = label
-            if label == "install":
-                lb = "install-efi"
-            kernel = localdata.getVar('KERNEL_IMAGETYPE')
-            cfgfile.write('linux /%s LABEL=%s' % (kernel, lb))
-
-            cfgfile.write(' %s' % replace_rootfs_uuid(d, root))
-
-            append = localdata.getVar('APPEND')
-            initrd = localdata.getVar('INITRD')
-
-            if append:
-                append = replace_rootfs_uuid(d, append)
-                cfgfile.write(' %s' % (append))
-
-            cfgfile.write(' %s' % btype[1])
-            cfgfile.write('\n')
-
-            if initrd:
-                cfgfile.write('initrd /initrd')
-            cfgfile.write('\n}\n')
-
-    cfgfile.close()
-}
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