From 668898d92c1a48ac4901661d0e5d7e4b117b09c0 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Fri, 1 May 2020 19:43:30 +0100 Subject: [PATCH 1/2] Bump only the UC20 pc image to 8GB, and keep Pi images as small as possible. LP: #1875430 --- live-build/auto/config | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index 04b8013d..088a6f19 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -359,8 +359,16 @@ case $IMAGEFORMAT in CHANNEL="${CHANNEL:-edge}" case $MODEL in pc-amd64|pc-i386) - [ -z "${SUBARCH:-}" ] \ - && UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M" + if [ -z "${SUBARCH:-}" ]; then + 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 @@ -375,7 +383,6 @@ case $IMAGEFORMAT in UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS -c $CHANNEL" ;; *) - UBUNTU_IMAGE_ARGS="--image-size 10G" # Ubuntu Core 20 # Currently uc20 assertions do not support global # channel overrides, instead we have per-channel models From e013459a08693071abc99180fed34d1422e7d799 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Fri, 1 May 2020 19:47:17 +0100 Subject: [PATCH 2/2] Bump only the UC20 pc image to 8GB, and keep Pi images as small as possible. (LP: #1875430) --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index d53e5f94..cf0b758c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Fri, 01 May 2020 19:47:10 +0100 + livecd-rootfs (2.664) focal; urgency=medium [ Patrick Viafore ]