From a907749a082334ee0a124ed317a8c235f789cd4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Mon, 8 Apr 2024 16:26:15 +0200 Subject: [PATCH] Add console-conf to UC24 extra snaps by default --- debian/changelog | 7 +++++++ live-build/auto/config | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 26698cff..15a249f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (24.04.58) UNRELEASED; urgency=medium + + * Add console-conf to UC24 extra snaps by default, as the models define + it as optional so we need to explicitly request it to be added. + + -- Łukasz 'sil2100' Zemczak Mon, 08 Apr 2024 16:24:38 +0200 + livecd-rootfs (24.04.57) noble; urgency=medium * Ensure the proper hooks are copied for Ubuntu MATE (LP: #2058161). diff --git a/live-build/auto/config b/live-build/auto/config index c43a9af0..4efde17b 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -510,7 +510,10 @@ case $IMAGEFORMAT in amd64+kassel) EXTRA_SNAPS="$EXTRA_SNAPS core bluez alsa-utils" ;; - *) ;; + *) + # For all Ubuntu Core 24 reference images, add console-conf + EXTRA_SNAPS="$EXTRA_SNAPS console-conf" + ;; esac for snap in $EXTRA_SNAPS; do UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --extra-snaps $snap"