Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-03-31 04:41:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'xnox/lp-uc20-8gb' of git+ssh://git.launchpad.net/livecd-rootfs into ubuntu/master

Browse Source
This commit is contained in:
Dimitri John Ledkov 2020-05-01 19:48:27 +01:00
commit 99e129f30c
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.664ubuntu1) UNRELEASED; urgency=medium
* Bump only the UC20 pc image to 8GB, and keep Pi images as small as possible.
(LP: #1875430)
-- Dimitri John Ledkov <xnox@ubuntu.com> Fri, 01 May 2020 19:47:10 +0100
livecd-rootfs (2.664) focal; urgency=medium livecd-rootfs (2.664) focal; urgency=medium
[ Patrick Viafore ] [ Patrick Viafore ]

13
live-build/auto/config
View File

@ -359,8 +359,16 @@ case $IMAGEFORMAT in
CHANNEL="${CHANNEL:-edge}" CHANNEL="${CHANNEL:-edge}"
case $MODEL in case $MODEL in
pc-amd64|pc-i386) pc-amd64|pc-i386)
[ -z "${SUBARCH:-}" ] \ if [ -z "${SUBARCH:-}" ]; then
&& UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M" case $SUITE in
xenial|bionic)
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M"
;;
*)
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 8G"
;;
esac
fi
;; ;;
*) ;; *) ;;
esac esac
@ -375,7 +383,6 @@ case $IMAGEFORMAT in
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS -c $CHANNEL" UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS -c $CHANNEL"
;; ;;
*) *)
UBUNTU_IMAGE_ARGS="--image-size 10G"
# Ubuntu Core 20 # Ubuntu Core 20
# Currently uc20 assertions do not support global # Currently uc20 assertions do not support global
# channel overrides, instead we have per-channel models # channel overrides, instead we have per-channel models