diff options
| author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2020-12-17 14:59:32 +0100 |
|---|---|---|
| committer | Adrian Dudau <adrian.dudau@enea.com> | 2021-01-14 14:33:36 +0100 |
| commit | 119b192b3ea3ab2b71e9bd86cbc2dcf900ab5b52 (patch) | |
| tree | eb086824c51bc9a872a399a4964725e2ce5014d7 | |
| parent | 18157262997a5e6999f36934fa107c09fced7991 (diff) | |
| download | meta-el-nfv-access-demo_CPDX-3245.tar.gz | |
grub: Fix backwards compatibility with OSTreehotfix_NFVSC-87hotfix_CPDX-3539demo_CPDX-3245
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 |