Imported 2.631

No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2019-12-11 22:18:24 +00:00
parent d3f8eccbde
commit c9b40d078d
2 changed files with 10 additions and 1 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.631) focal; urgency=medium
* Add support for uc20 model assertions.
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Tue, 10 Dec 2019 15:27:39 +0100
livecd-rootfs (2.630) focal; urgency=medium
* Drop installing dummy transitional linux-signed-generic, these days

View File

@ -356,9 +356,12 @@ case $IMAGEFORMAT in
xenial)
# Ubuntu Core 16
;;
*)
bionic)
# Ubuntu Core 18
MODEL="ubuntu-core-18-${MODEL#pc-}" ;;
*)
# Ubuntu Core 20
MODEL="ubuntu-core-20-${MODEL#pc-}" ;;
esac
case "$ARCH+${SUBARCH:-}" in