Merge branch 'uc20-no-fixed-size' of git+ssh://git.launchpad.net/livecd-rootfs into ubuntu/focal

This commit is contained in:
Łukasz 'sil2100' Zemczak 2020-11-27 17:59:08 +01:00
commit a4838e3245
2 changed files with 7 additions and 3 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.664.10) UNRELEASED; urgency=medium
* Do not hard-code the UC20 amd64 image size as now ubuntu-image should be
able to properly calculate the needed size itself.
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Fri, 27 Nov 2020 17:58:38 +0100
livecd-rootfs (2.664.9) focal; urgency=medium
[ John Chittum]

View File

@ -364,9 +364,6 @@ case $IMAGEFORMAT in
xenial|bionic)
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M"
;;
*)
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 8G"
;;
esac
fi
;;