grub: Fix loader link, unify grub.cfg locationstest_branchout_newtest_branchout

1. Fix an obviously broken link created during installation

This led to issues creating/editing the grubenv file during NFVA
installation calls to `grub-mkconfig`.
These errors were not observed before, since stderr was not logged
during the installation.
Also, the link was fixed later on, so subsequent calls to grub-*
utilities no longer complained about it; the error only happened
during the NFVA installation.

2. Unify expected locations of grub.cfg

Previously, there were 3 possible locations of grub.cfg used
throughout the layers/scripts:
- /boot/loader/grub.cfg - the proper location, used by NFVA installer
  components, as well as ostree related tooling;
- /boot/grub/grub.cfg - used in some recipes, but not present on the
  board currently. Also the expected default location of our current
  grub-* utilites, since we build grub without an explicit
  `--with-grubdir` configure argument, which defaults (guessing) to
  the `PACKAGE` name, in our case `grub` (and not `grub2`);
- /boot/grub2/grub.cfg - used in OTA image scripts by linking it to
  /boot/loader/grub.cfg - however the link is later converted into
  a real file, ending up duplicating the real grub.cfg (although they
  are identical content-wise, they might confuse the user);

To settle this confusion, we will keep only /boot/loader/grub.cfg as
the true configuration file and convert /boot/grub2 to a symlink
pointing at /boot/loader, while also renaming it to /boot/grub.
This has the benefit of "fixing" all grub-* tools which try to write
their configuration files to /boot/grub. An alternative for that would
be building grub2 with the configure flag `--with-grubdir=loader`, but
that might break other things, so a symlink for the traditional
/boot/grub is safer.

Before creating this link, `grub-editenv list` would not work without
explicitly providing the filepath of the `/boot/loader/grubenv` file,
which might not be obvious for the end user.
Also, before this link, `grub-mkconfig` required explicitly setting the
`-p` (prefix) to '/' while running on the target.
Both of these issues will be fixed with the new link.

Since our ostree version (2018.7) is quite old, it requires one backport
for it to also check for /boot/grub/grub.cfg and not only
/boot/grub2/grub.cfg. The backport will be handled in the
meta-enea-virtualiation layer, hence this change's dependency.

Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Depends-on: I6bdc80e08a272e1534dd63717348bfaa50807d93
Change-Id: If8a61c89200414922a3f36e6c8fca58d7d3b6495

2 files changed, 3 insertions, 3 deletions

diff --git a/classes/override_image_types_ostree.inc b/classes/override_image_types_ostree.inc
index 241afcd..011e27e 100644
--- a/classes/override_image_types_ostree.inc
+++ b/classes/override_image_types_ostree.inc
@@ -124,7 +124,7 @@ IMAGE_CMD_ostree () {
 
     mkdir -p boot/loader.0
     mkdir -p boot/loader.1
-    ln -sf boot/loader.0 boot/loader
+    ln -sf loader.0 boot/loader
 
     checksum=`sha256sum ${DEPLOY_DIR_IMAGE}/${OSTREE_KERNEL} | cut -f 1 -d " "`
 
diff --git a/classes/override_image_types_ota.inc b/classes/override_image_types_ota.inc
index 17508b2..ded70dd 100644
--- a/classes/override_image_types_ota.inc
+++ b/classes/override_image_types_ota.inc
@@ -33,8 +33,8 @@ IMAGE_CMD_otaimg () {
                 ln -s loader.0 ${PHYS_SYSROOT}/boot/loader
 
                 if [ "${OSTREE_BOOTLOADER}" = "grub" ]; then
-                        mkdir -p ${PHYS_SYSROOT}/boot/grub2
-                        ln -s ../loader/grub.cfg ${PHYS_SYSROOT}/boot/grub2/grub.cfg
+                        ln -s loader ${PHYS_SYSROOT}/boot/grub
+                        touch ${PHYS_SYSROOT}/boot/grub/grub.cfg
                 elif [ "${OSTREE_BOOTLOADER}" = "u-boot" ]; then
                         touch ${PHYS_SYSROOT}/boot/loader/uEnv.txt
                 else