Make sure the imx6 subarch uses the ubuntu-image imageformat.

This commit is contained in:
Łukasz 'sil2100' Zemczak 2019-10-29 12:33:20 +01:00
parent 7c85d91d41
commit 2896d39a7a
2 changed files with 14 additions and 6 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.621) UNRELEASED; urgency=medium
* Make sure the imx6 subarch uses the ubuntu-image imageformat.
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Tue, 29 Oct 2019 12:31:35 +0100
livecd-rootfs (2.620) eoan; urgency=medium
* Limit the lxd group to images with an installer; it's less appropriate

View File

@ -279,12 +279,14 @@ _get_live_passes ()
if [ -z "${IMAGEFORMAT:-}" ]; then
case $PROJECT:${SUBPROJECT:-} in
ubuntu-cpc:*|ubuntu:desktop-preinstalled)
if [ "$SUBARCH" = "raspi3" ]; then
# For now only raspi3, but others are soon to follow
IMAGEFORMAT=ubuntu-image
else
IMAGEFORMAT=ext4
fi
case $SUBARCH in
raspi3|imx6)
IMAGEFORMAT=ubuntu-image
;;
*)
IMAGEFORMAT=ext4
;;
esac
;;
ubuntu-server:live)
IMAGEFORMAT=plain