Imported 2.822

No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2023-04-10 19:48:12 +00:00
parent dcb48eae8d
commit 155ec305b3
2 changed files with 9 additions and 1 deletions

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.822) lunar; urgency=medium
[ jchittum ]
* riscv64: fix conditional check in install-grub to correctly check if
platform supports grub-efi-64, or exit func. (LP: #2015750)
-- Steve Langasek <steve.langasek@ubuntu.com> Mon, 10 Apr 2023 08:37:30 -0700
livecd-rootfs (2.821) lunar; urgency=medium livecd-rootfs (2.821) lunar; urgency=medium
[ Chad Smith ] [ Chad Smith ]

View File

@ -455,7 +455,7 @@ EOF
if [ "${SUBARCH:-}" != "nezha" ] && \ if [ "${SUBARCH:-}" != "nezha" ] && \
[ "${SUBARCH:-}" != "licheerv" ] && \ [ "${SUBARCH:-}" != "licheerv" ] && \
[ "${SUBARCH:-}" != "icicle" ] \ [ "${SUBARCH:-}" != "icicle" ] && \
[ "${SUBARCH:-}" != "visionfive" ] && \ [ "${SUBARCH:-}" != "visionfive" ] && \
[ "${SUBARCH:-}" != "visionfive2" ]; then [ "${SUBARCH:-}" != "visionfive2" ]; then
## TODO remove below once we have grub-efi-riscv64 for the platforms ## TODO remove below once we have grub-efi-riscv64 for the platforms