From c2733a55f73a0425fe4e82b7781f977096396da2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Thu, 3 Dec 2020 12:18:57 +0100 Subject: [PATCH] Still hardcode UC20 amd64 image size, but to the same value as for UC16 and UC18. --- debian/changelog | 9 +++++++++ live-build/auto/config | 7 ++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index aa171cae..52296e72 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.706) UNRELEASED; urgency=medium + + * As per discussion, we might want to keep the UC20 images a bit bigger than + what's defined via the gadget/rootfs contents, to make sure writable is + comfortably big enough. Use the same hard-coded value as for UC16 and UC18. + (LP: #1905990) + + -- Łukasz 'sil2100' Zemczak Thu, 03 Dec 2020 12:02:32 +0100 + livecd-rootfs (2.705) hirsute; urgency=medium * config: on hirsute build UC22 images diff --git a/live-build/auto/config b/live-build/auto/config index 34a765aa..a051be23 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -361,11 +361,8 @@ case $IMAGEFORMAT in case $MODEL in pc-amd64|pc-i386) if [ -z "${SUBARCH:-}" ]; then - case $SUITE in - xenial|bionic) - UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M" - ;; - esac + # This is to make sure there's enough writable space + UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M" fi ;; *) ;;