diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2020-12-17 14:59:32 +0100 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2020-12-17 14:59:32 +0100 |
commit | 70848fd5efb411cd83ad157323fbf796d688bb56 (patch) | |
tree | fbcc6c6119fced7caf29afdb1556bddfbd61bfff | |
parent | 409e90e04504715028019eb09cb75425a47ab3ee (diff) | |
download | meta-el-nfv-access-70848fd5efb411cd83ad157323fbf796d688bb56.tar.gz |
grub: Fix backwards compatibility with OSTreefeature_CPDX-3499
Before NFVA 2.3.0, OSTree only checked for the existence of
/boot/grub2/grub.cfg, skipping creating grub.cfg if that file was not
present.
In NFVA 2.3.0, only /boot/grub/grub.cfg is created, leading to issues
when trying to downgrade to an older NFVA release.
To maintain backwards compatibility with OSTree versions that only
check the old path, create both /boot/{grub,grub2} as symlinks to the
loader directory managed by OSTree.
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Change-Id: Ic2c89930794e4c9d3ee3b2468d1331e5d7f63834
-rw-r--r-- | classes/override_image_types_ota.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/classes/override_image_types_ota.inc b/classes/override_image_types_ota.inc index ded70dd..da920c1 100644 --- a/classes/override_image_types_ota.inc +++ b/classes/override_image_types_ota.inc | |||
@@ -34,6 +34,7 @@ IMAGE_CMD_otaimg () { | |||
34 | 34 | ||
35 | if [ "${OSTREE_BOOTLOADER}" = "grub" ]; then | 35 | if [ "${OSTREE_BOOTLOADER}" = "grub" ]; then |
36 | ln -s loader ${PHYS_SYSROOT}/boot/grub | 36 | ln -s loader ${PHYS_SYSROOT}/boot/grub |
37 | ln -s loader ${PHYS_SYSROOT}/boot/grub2 | ||
37 | touch ${PHYS_SYSROOT}/boot/grub/grub.cfg | 38 | touch ${PHYS_SYSROOT}/boot/grub/grub.cfg |
38 | elif [ "${OSTREE_BOOTLOADER}" = "u-boot" ]; then | 39 | elif [ "${OSTREE_BOOTLOADER}" = "u-boot" ]; then |
39 | touch ${PHYS_SYSROOT}/boot/loader/uEnv.txt | 40 | touch ${PHYS_SYSROOT}/boot/loader/uEnv.txt |